From: Wayne Davison <wayned@samba.org>
Date: Sun, 30 Mar 2008 15:05:50 +0000 (-0700)
Subject: Some argc-based actions in parse_arguments() shouldn't happen on
X-Git-Tag: v3.0.1pre3~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20893751791a1bb7417b9fa72e91c909619bca6a;p=thirdparty%2Frsync.git

Some argc-based actions in parse_arguments() shouldn't happen on
the server side.
---

diff --git a/options.c b/options.c
index 75a6d637..0ad26f89 100644
--- a/options.c
+++ b/options.c
@@ -1275,7 +1275,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 		}
 	}
 
-	if (human_readable && argc == 2) {
+	if (human_readable && argc == 2 && !am_server) {
 		/* Allow the old meaning of 'h' (--help) on its own. */
 		usage(FINFO);
 		exit_cleanup(0);
@@ -1387,7 +1387,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 			xfer_dirs = 1;
 	}
 
-	if (argc < 2 && !read_batch)
+	if (argc < 2 && !read_batch && !am_server)
 		list_only |= 1;
 
 	if (xfer_dirs >= 4) {