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

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index cf2674d..14392e0 100644 (file)
--- a/main.c
+++ b/main.c
@@ -171,6 +171,7 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int
        int i,argc=0;
        pid_t ret;
        char *tok,*dir=NULL;
+       int dash_l_set = 0;
        extern int local_server;
        extern char *rsync_path;
        extern int blocking_io;
@@ -190,15 +191,22 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int
                        args[argc++] = tok;
                }
 
+               /* check to see if we've already been given '-l user' in 
+                  the remote-shell command */
+               for (i = 0; i < argc-1; i++) {
+                       if (!strcmp(args[i], "-l") && args[i+1][0] != '-')
+                               dash_l_set = 1;
+               }
+
 #if HAVE_REMSH
                /* remsh (on HPUX) takes the arguments the other way around */
                args[argc++] = machine;
-               if (user) {
+               if (user && !(daemon_over_rsh && dash_l_set)) {
                        args[argc++] = "-l";
                        args[argc++] = user;
                }
 #else
-               if (user) {
+               if (user && !(daemon_over_rsh && dash_l_set)) {
                        args[argc++] = "-l";
                        args[argc++] = user;
                }
@@ -687,7 +695,7 @@ static int start_client(int argc, char *argv[])
                        *p = 0;
                        path = p+1;
                } else {
-                       path="";
+                       path = "";
                }
                p = strchr(host,':');
                if (p) {
@@ -698,7 +706,7 @@ static int start_client(int argc, char *argv[])
        }
 
        if (!read_batch) {
-           p = find_colon(argv[0]);
+               p = find_colon(argv[0]);
 
        if (p) {
                if (p[1] == ':') { /* double colon */
@@ -725,6 +733,26 @@ static int start_client(int argc, char *argv[])
        } else {
                am_sender = 1;
 
+               /* rsync:// destination uses rsync server over direct socket */
+               if (strncasecmp(URL_PREFIX, argv[argc-1], strlen(URL_PREFIX)) == 0) {
+                       char *host, *path;
+
+                       host = argv[argc-1] + strlen(URL_PREFIX);
+                       p = strchr(host,'/');
+                       if (p) {
+                               *p = 0;
+                               path = p+1;
+                       } else {
+                               path = "";
+                       }
+                       p = strchr(host,':');
+                       if (p) {
+                               rsync_port = atoi(p+1);
+                               *p = 0;
+                       }
+                       return start_socket_client(host, path, argc-1, argv);
+               }
+
                p = find_colon(argv[argc-1]);
                if (!p) {
                        local_server = 1;