X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a6a276027c059e8dbf104f3472de3ab533f92941..ac669e8b922c7ace230294f9bf9a3a2bdfbd19d2:/options.c

diff --git a/options.c b/options.c
index 30af80df..d7c7cbec 100644
--- a/options.c
+++ b/options.c
@@ -357,7 +357,6 @@ void usage(enum logcode F)
   rprintf(F,"     --stats                 give some file-transfer stats\n");
   rprintf(F," -8, --8-bit-output          leave high-bit chars unescaped in output\n");
   rprintf(F," -h, --human-readable        output numbers in a human-readable format\n");
-  rprintf(F,"     --si                    like human-readable, but use powers of 1000\n");
   rprintf(F,"     --progress              show progress during transfer\n");
   rprintf(F," -P                          same as --partial --progress\n");
   rprintf(F," -i, --itemize-changes       output a change-summary for all updates\n");
@@ -374,7 +373,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");
@@ -397,8 +396,7 @@ static struct poptOption long_options[] = {
   {"no-v",             0,  POPT_ARG_VAL,    &verbose, 0, 0, 0 },
   {"quiet",           'q', POPT_ARG_NONE,   0, 'q', 0, 0 },
   {"stats",            0,  POPT_ARG_NONE,   &do_stats, 0, 0, 0 },
-  {"human-readable",  'h', POPT_ARG_VAL,    &human_readable, 1, 0, 0},
-  {"si",               0,  POPT_ARG_VAL,    &human_readable, 2, 0, 0},
+  {"human-readable",  'h', POPT_ARG_NONE,   0, 'h', 0, 0},
   {"dry-run",         'n', POPT_ARG_NONE,   &dry_run, 0, 0, 0 },
   {"archive",         'a', POPT_ARG_NONE,   0, 'a', 0, 0 },
   {"recursive",       'r', POPT_ARG_VAL,    &recurse, 2, 0, 0 },
@@ -927,6 +925,10 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 			preserve_devices = preserve_specials = 0;
 			break;
 
+		case 'h':
+			human_readable++;
+			break;
+
 		case 'i':
 			itemize_changes++;
 			break;
@@ -1076,6 +1078,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 	}
 
 	if (human_readable && *argc == 2) {
+		/* Allow the old meaning of 'h' (--help) on its own. */
 		usage(FINFO);
 		exit_cleanup(0);
 	}
@@ -1290,8 +1293,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 		log_before_transfer = !am_server;
 	}
 
-	if ((do_progress || dry_run) && !verbose && !log_before_transfer
-	    && !am_server)
+	if (do_progress && !verbose && !log_before_transfer && !am_server)
 		verbose = 1;
 
 	if (dry_run)
@@ -1362,7 +1364,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 		return 0;
 #endif
 	} else {
-		if (keep_partial && !partial_dir) {
+		if (keep_partial && !partial_dir && !am_server) {
 			if ((arg = getenv("RSYNC_PARTIAL_DIR")) != NULL && *arg)
 				partial_dir = strdup(arg);
 		}
@@ -1641,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;