Some simple whitespace tweaks.

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 0aeb29c..75070e3 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;
@@ -84,7 +85,7 @@ void wait_process(pid_t pid, int *status)
                io_flush(FULL_FLUSH);
        }
 
-       if ((waited_pid == -1) && (errno == ECHILD)) {
+       if (waited_pid == -1 && errno == ECHILD) {
                /* status of requested child no longer available.
                 * check to see if it was processed by the sigchld_handler.
                 */
@@ -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) {
@@ -217,7 +219,7 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
                    int *f_in, int *f_out)
 {
        int i, argc = 0;
-       char *args[100];
+       char *args[MAX_ARGS];
        pid_t ret;
        char *tok, *dir = NULL;
        int dash_l_set = 0;
@@ -232,8 +234,14 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
                if (!cmd)
                        goto oom;
 
-               for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " "))
+               for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " ")) {
+                       /* Comparison leaves rooms for server_options(). */
+                       if (argc >= MAX_ARGS - 100) {
+                               rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
+                               exit_cleanup(RERR_SYNTAX);
+                       }
                        args[argc++] = tok;
+               }
 
                /* check to see if we've already been given '-l user' in
                 * the remote-shell command */
@@ -270,6 +278,11 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
                }
 
                server_options(args,&argc);
+
+               if (argc >= MAX_ARGS - 2) {
+                       rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
+                       exit_cleanup(RERR_SYNTAX);
+               }
        }
 
        args[argc++] = ".";
@@ -277,16 +290,11 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
        if (!daemon_over_rsh && path && *path)
                args[argc++] = path;
 
-       if (argc >= (int)(sizeof args / sizeof args[0])) {
-               rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
-               exit_cleanup(RERR_MALLOC); /* XXX Need better RERR? */
-       }
-
        args[argc] = NULL;
 
        if (verbose > 3) {
                rprintf(FINFO,"cmd=");
-               for (i=0;i<argc;i++)
+               for (i = 0; i < argc; i++)
                        rprintf(FINFO,"%s ",args[i]);
                rprintf(FINFO,"\n");
        }
@@ -299,7 +307,8 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
                ret = piped_child(args,f_in,f_out);
        }
 
-       if (dir) free(dir);
+       if (dir)
+               free(dir);
 
        return ret;
 
@@ -387,12 +396,12 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
                int l = strlen(dir);
                if (strcmp(dir,"/") == 0)
                        l = 0;
-               for (i=0;i<argc;i++)
+               for (i = 0; i < argc; i++)
                        argv[i] += l+1;
        }
 
        if (argc == 0 && recurse) {
-               argc=1;
+               argc = 1;
                argv--;
                argv[0] = ".";
        }
@@ -419,7 +428,7 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
 static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 {
        int pid;
-       int status=0;
+       int status = 0;
        int error_pipe[2];
 
        if (preserve_hard_links)
@@ -439,9 +448,10 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 
        io_flush(NORMAL_FLUSH);
 
-       if ((pid=do_fork()) == 0) {
+       if ((pid = do_fork()) == 0) {
                close(error_pipe[0]);
-               if (f_in != f_out) close(f_out);
+               if (f_in != f_out)
+                       close(f_out);
 
                /* we can't let two processes write to the socket at one time */
                io_multiplexing_close();
@@ -465,7 +475,8 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
        am_generator = 1;
 
        close(error_pipe[1]);
-       if (f_in != f_out) close(f_in);
+       if (f_in != f_out)
+               close(f_in);
 
        io_start_buffering_out(f_out);
 
@@ -544,7 +555,8 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
        if (argc > 0) {
                if (strcmp(dir,".")) {
                        argv[0] += strlen(dir);
-                       if (argv[0][0] == '/') argv[0]++;
+                       if (argv[0][0] == '/')
+                               argv[0]++;
                }
                local_name = get_local_name(flist,argv[0]);
        }
@@ -572,6 +584,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 +621,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 +745,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 +765,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 +774,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 +798,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 +806,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 +836,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 +861,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;
        }