X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/08d82b84cbed81203ffaa349228421c47aee4b14..75c51953f165cbb2b256bad9edeb581ec70c36b2:/options.c

diff --git a/options.c b/options.c
index 3101c3da..dacc3b88 100644
--- a/options.c
+++ b/options.c
@@ -251,13 +251,13 @@ void usage(enum logcode F)
 
   rprintf(F,"\nrsync is a file transfer program capable of efficient remote update\nvia a fast differencing algorithm.\n\n");
 
-  rprintf(F,"Usage: rsync [OPTION]... SRC [SRC]... [USER@]HOST:DEST\n");
+  rprintf(F,"Usage: rsync [OPTION]... SRC [SRC]... DEST\n");
+  rprintf(F,"  or   rsync [OPTION]... SRC [SRC]... [USER@]HOST:DEST\n");
+  rprintf(F,"  or   rsync [OPTION]... SRC [SRC]... [USER@]HOST::DEST\n");
+  rprintf(F,"  or   rsync [OPTION]... SRC [SRC]... rsync://[USER@]HOST[:PORT]/DEST\n");
   rprintf(F,"  or   rsync [OPTION]... [USER@]HOST:SRC [DEST]\n");
-  rprintf(F,"  or   rsync [OPTION]... SRC [SRC]... DEST\n");
   rprintf(F,"  or   rsync [OPTION]... [USER@]HOST::SRC [DEST]\n");
-  rprintf(F,"  or   rsync [OPTION]... SRC [SRC]... [USER@]HOST::DEST\n");
   rprintf(F,"  or   rsync [OPTION]... rsync://[USER@]HOST[:PORT]/SRC [DEST]\n");
-  rprintf(F,"  or   rsync [OPTION]... SRC [SRC]... rsync://[USER@]HOST[:PORT]/DEST\n");
   rprintf(F,"The ':' usages connect via remote shell, while '::' & 'rsync://' usages connect\n");
   rprintf(F,"to an rsync daemon, and require SRC or DEST to start with a module name.\n");
   rprintf(F,"\nOptions\n");
@@ -1005,7 +1005,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 	if (files_from) {
 		if (recurse == 1) /* preserve recurse == 2 */
 			recurse = 0;
-		if (xfer_dirs < 0)
+		if (xfer_dirs < 1)
 			xfer_dirs = 1;
 	}
 
@@ -1022,7 +1022,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 			"You may not combine multiple --delete-WHEN options.\n");
 		return 0;
 	}
-	if (!recurse) {
+	if (!xfer_dirs) {
 		delete_before = delete_during = delete_after = 0;
 		delete_mode = delete_excluded = 0;
 	} else if (delete_before || delete_during || delete_after)