Added some missing changes.

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index c6a3165..9aceed2 100644 (file)
--- a/main.c
+++ b/main.c
@@ -43,6 +43,7 @@ extern int local_server;
 extern int log_got_error;
 extern int module_id;
 extern int orig_umask;
+extern int keep_dirlinks;
 extern int preserve_hard_links;
 extern int protocol_version;
 extern int recurse;
@@ -120,7 +121,8 @@ static void report(int f)
 
        if (am_daemon) {
                log_exit(0, __FILE__, __LINE__);
-               if (f == -1 || !am_sender) return;
+               if (f == -1 || !am_sender)
+                       return;
        }
 
        if (am_server) {
@@ -572,6 +574,7 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
                io_start_multiplex_out(f_out);
 
        if (am_sender) {
+               keep_dirlinks = 0; /* Must be disabled on the sender. */
                if (!read_batch) {
                        recv_exclude_list(f_in);
                        if (cvs_exclude)
@@ -608,6 +611,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
                io_start_multiplex_in(f_in);
 
        if (am_sender) {
+               keep_dirlinks = 0; /* Must be disabled on the sender. */
                io_start_buffering_out(f_out);
                if (cvs_exclude)
                        add_cvs_excludes();
@@ -731,9 +735,9 @@ static int start_client(int argc, char *argv[])
                return start_socket_client(host, path, argc-1, argv+1);
        }
 
-       if (!read_batch) {
+       if (!read_batch) { /* for read_batch, NO source is specified */
                p = find_colon(argv[0]);
-               if (p) {
+               if (p) { /* source is remote */
                        if (remote_filesfrom_file
                         && remote_filesfrom_file != files_from + 1
                         && strncmp(files_from, argv[0], p-argv[0]+1) != 0) {
@@ -751,7 +755,7 @@ static int start_client(int argc, char *argv[])
                                daemon_over_rsh = 1;
                        }
 
-                       if (argc < 1) {
+                       if (argc < 1) { /* destination required */
                                usage(FERROR);
                                exit_cleanup(RERR_SYNTAX);
                        }
@@ -760,9 +764,8 @@ static int start_client(int argc, char *argv[])
                        *p = 0;
                        shell_machine = argv[0];
                        shell_path = p+1;
-                       argc--;
                        argv++;
-               } else {
+               } else { /* source is local */
                        am_sender = 1;
 
                        /* rsync:// destination uses rsync server over direct socket */
@@ -785,7 +788,7 @@ static int start_client(int argc, char *argv[])
                                return start_socket_client(host, path, argc-1, argv);
                        }
 
-                       p = find_colon(argv[argc-1]);
+                       p = find_colon(argv[argc-1]); /* look in dest arg */
                        if (p && remote_filesfrom_file
                         && remote_filesfrom_file != files_from + 1
                         && strncmp(files_from, argv[argc-1], p-argv[argc-1]+1) != 0) {
@@ -793,7 +796,7 @@ static int start_client(int argc, char *argv[])
                                        "--files-from hostname is not transfer hostname\n");
                                exit_cleanup(RERR_SYNTAX);
                        }
-                       if (!p) {
+                       if (!p) { /* no colon found, so src & dest are local */
                                local_server = 1;
                                if (remote_filesfrom_file) {
                                        rprintf(FERROR,
@@ -823,9 +826,9 @@ static int start_client(int argc, char *argv[])
                                shell_machine = argv[argc-1];
                                shell_path = p+1;
                        }
-                       argc--;
                }
-       } else {
+               argc--;
+       } else {  /* read_batch */
                am_sender = 1;
                local_server = 1;
                shell_path = argv[argc-1];
@@ -848,12 +851,14 @@ static int start_client(int argc, char *argv[])
                        shell_path?shell_path:"");
        }
 
+       /* for remote source, only single dest arg can remain ... */
        if (!am_sender && argc > 1) {
                usage(FERROR);
                exit_cleanup(RERR_SYNTAX);
        }
 
-       if (argc == 0 && !am_sender) {
+       /* ... or no dest at all */
+       if (!am_sender && argc == 0) {
                list_only = 1;
        }