Moved the orig_umask variable's definition into main.c since it

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index 527797f..f3039a7 100644 (file)
--- a/options.c
+++ b/options.c
@@ -75,7 +75,6 @@ int am_server = 0;
 int am_sender = 0;
 int am_generator = 0;
 int am_starting_up = 1;
-int orig_umask = 0;
 int relative_paths = -1;
 int implied_dirs = 1;
 int numeric_ids = 0;
@@ -373,7 +372,7 @@ void usage(enum logcode F)
   rprintf(F," -6, --ipv6                  prefer IPv6\n");
 #endif
   rprintf(F,"     --version               print version number\n");
-  rprintf(F,"     --help                  show this help screen\n");
+  rprintf(F,"(-h) --help                  show this help (-h works with no other options)\n");
 
   rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n");
   rprintf(F,"Please see the rsync(1) and rsyncd.conf(5) man pages for full documentation.\n");
@@ -592,6 +591,7 @@ void option_error(void)
        }
 
        rprintf(FERROR, RSYNC_NAME ": %s", err_buf);
+       msleep(20);
 }
 
 
@@ -1643,11 +1643,10 @@ void server_options(char **args,int *argc)
                        args[ac++] = "--only-write-batch=X";
                if (am_root > 1)
                        args[ac++] = "--super";
+               if (size_only)
+                       args[ac++] = "--size-only";
        }
 
-       if (size_only)
-               args[ac++] = "--size-only";
-
        if (modify_window_set) {
                if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
                        goto oom;