Patch from J.W. Schultz to have --include-from and --exclude-from on

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index d43399b..7ed8823 100644 (file)
--- a/options.c
+++ b/options.c
@@ -66,7 +66,8 @@ int module_id = -1;
 int am_server = 0;
 int am_sender = 0;
 int recurse = 0;
-int am_daemon=0;
+int am_daemon = 0;
+int daemon_over_rsh = 0;
 int do_stats=0;
 int do_progress=0;
 int keep_partial=0;
@@ -201,6 +202,7 @@ void usage(enum logcode F)
   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,"SRC on single-colon remote HOST will be expanded by remote shell\n");
   rprintf(F,"SRC on server remote HOST may contain shell wildcards or multiple\n");
   rprintf(F,"  sources separated by space as long as they have same top-level\n");
@@ -655,6 +657,13 @@ void server_options(char **args,int *argc)
 
        args[ac++] = "--server";
 
+       if (daemon_over_rsh) {
+               args[ac++] = "--daemon";
+               *argc = ac;
+               /* if we're passing --daemon, we're done */
+               return;
+       }
+
        if (!am_sender)
                args[ac++] = "--sender";