bug fix from Jay Lepreau for null expansion.

[unix-history] / usr / src / usr.bin / rdist / main.c

diff --git a/usr/src/usr.bin/rdist/main.c b/usr/src/usr.bin/rdist/main.c
index d36dcb7..899e4a5 100644 (file)
--- a/usr/src/usr.bin/rdist/main.c
+++ b/usr/src/usr.bin/rdist/main.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)main.c      4.11 (Berkeley) 84/04/06";
+static char *sccsid = "@(#)main.c      4.13 (Berkeley) 84/09/21";

 #endif
 
 #include "defs.h"
 #endif
 
 #include "defs.h"


@@ -18,8 +18,6 @@ int   qflag;          /* Quiet. Don't print messages */
 int    options;        /* global options */
 int    iamremote;      /* act as remote server for transfering files */
 
 int    options;        /* global options */
 int    iamremote;      /* act as remote server for transfering files */
 

-int    filec;          /* number of files to update */
-char   **filev;        /* list of files/directories to update */

 FILE   *fin = NULL;    /* input file pointer */
 int    rem = -1;       /* file descriptor to remote source/sink process */
 char   host[32];       /* host name */
 FILE   *fin = NULL;    /* input file pointer */
 int    rem = -1;       /* file descriptor to remote source/sink process */
 char   host[32];       /* host name */


@@ -114,6 +112,14 @@ main(argc, argv)
                                options |= YOUNGER;
                                break;
 
                                options |= YOUNGER;
                                break;
 

+                       case 'h':
+                               options |= FOLLOW;
+                               break;
+
+                       case 'i':
+                               options |= IGNLNKS;
+                               break;
+

                        default:
                                usage();
                        }
                        default:
                                usage();
                        }


@@ -143,8 +149,8 @@ main(argc, argv)
 
 usage()
 {
 
 usage()
 {

-       printf("Usage: rdist [-nqbrvwyD] [-f distfile] [-d var=value] [file ...]\n");
-       printf("or: rdist [-nqbrvwyD] -c source [...] machine[:dest]\n");
+       printf("Usage: rdist [-nqbhirvwyD] [-f distfile] [-d var=value] [file ...]\n");
+       printf("or: rdist [-nqbhirvwyD] -c source [...] machine[:dest]\n");

        exit(1);
 }
 
        exit(1);
 }
 


@@ -197,7 +203,7 @@ docmdargs(nargs, args)
                printf("hosts = ");
                prnames(hosts);
        }
                printf("hosts = ");
                prnames(hosts);
        }

-       insert(files, hosts, cmds);
+       insert(NULL, files, hosts, cmds);

        docmds(0, NULL);
 }
 
        docmds(0, NULL);
 }