- Improved option_error() to make sure that the user sees the error in

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 0a0794a..0aeb29c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -108,7 +108,6 @@ void wait_process(pid_t pid, int *status)
 static void report(int f)
 {
        time_t t = time(NULL);
-       int send_stats;
 
        if (do_stats && verbose > 1) {
                /* These come out from every process */
@@ -124,9 +123,8 @@ static void report(int f)
                if (f == -1 || !am_sender) return;
        }
 
-       send_stats = verbose || protocol_version >= 20;
        if (am_server) {
-               if (am_sender && send_stats) {
+               if (am_sender) {
                        int64 w;
                        /* store total_written in a temporary
                         * because write_longint changes it */
@@ -140,7 +138,7 @@ static void report(int f)
 
        /* this is the client */
 
-       if (!am_sender && send_stats) {
+       if (!am_sender) {
                int64 r;
                stats.total_written = read_longint(f);
                /* store total_read in a temporary, read_longint changes it */
@@ -150,12 +148,6 @@ static void report(int f)
        }
 
        if (do_stats) {
-               if (!am_sender && !send_stats) {
-                       /* missing the bytes written by the generator */
-                       rprintf(FINFO, "\nCannot show stats as receiver because remote protocol version is less than 20\n");
-                       rprintf(FINFO, "Use --stats -v to show stats\n");
-                       return;
-               }
                rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files);
                rprintf(FINFO,"Number of files transferred: %d\n",
                        stats.num_transferred_files);
@@ -221,12 +213,13 @@ static void show_malloc_stats(void)
 
 
 /* Start the remote shell.   cmd may be NULL to use the default. */
-static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
+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];
-       int i,argc=0;
        pid_t ret;
-       char *tok,*dir=NULL;
+       char *tok, *dir = NULL;
        int dash_l_set = 0;
 
        if (!read_batch && !local_server) {
@@ -239,9 +232,8 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int
                if (!cmd)
                        goto oom;
 
-               for (tok=strtok(cmd," ");tok;tok=strtok(NULL," ")) {
+               for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " "))
                        args[argc++] = tok;
-               }
 
                /* check to see if we've already been given '-l user' in
                 * the remote-shell command */
@@ -285,6 +277,11 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int
        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) {
@@ -327,8 +324,8 @@ static char *get_local_name(struct file_list *flist,char *name)
        if (do_stat(name,&st) == 0) {
                if (S_ISDIR(st.st_mode)) {
                        if (!push_dir(name)) {
-                               rprintf(FERROR, "push_dir %s failed: %s (1)\n",
-                                       full_fname(name), strerror(errno));
+                               rsyserr(FERROR, errno, "push_dir#1 %s failed",
+                                       full_fname(name));
                                exit_cleanup(RERR_FILESELECT);
                        }
                        return NULL;
@@ -344,8 +341,7 @@ static char *get_local_name(struct file_list *flist,char *name)
                return name;
 
        if (do_mkdir(name,0777 & ~orig_umask) != 0) {
-               rprintf(FERROR, "mkdir %s failed: %s\n",
-                       full_fname(name), strerror(errno));
+               rsyserr(FERROR, errno, "mkdir %s failed", full_fname(name));
                exit_cleanup(RERR_FILEIO);
        } else {
                if (verbose > 0)
@@ -353,8 +349,8 @@ static char *get_local_name(struct file_list *flist,char *name)
        }
 
        if (!push_dir(name)) {
-               rprintf(FERROR, "push_dir %s failed: %s (2)\n",
-                       full_fname(name), strerror(errno));
+               rsyserr(FERROR, errno, "push_dir#2 %s failed",
+                       full_fname(name));
                exit_cleanup(RERR_FILESELECT);
        }
 
@@ -373,9 +369,15 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
                        (long)getpid());
        }
 
+       if (am_daemon && lp_write_only(module_id) && am_sender) {
+               rprintf(FERROR, "ERROR: module is write only\n");
+               exit_cleanup(RERR_SYNTAX);
+               return;
+       }
+
        if (!relative_paths && !push_dir(dir)) {
-               rprintf(FERROR, "push_dir %s failed: %s (3)\n",
-                       full_fname(dir), strerror(errno));
+               rsyserr(FERROR, errno, "push_dir#3 %s failed",
+                       full_fname(dir));
                exit_cleanup(RERR_FILESELECT);
        }
        argc--;
@@ -491,7 +493,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
 {
        int status;
        struct file_list *flist;
-       char *local_name=NULL;
+       char *local_name = NULL;
        char *dir = NULL;
 
        if (verbose > 2) {
@@ -511,8 +513,8 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
                argc--;
                argv++;
                if (!am_daemon && !push_dir(dir)) {
-                       rprintf(FERROR, "push_dir %s failed: %s (4)\n",
-                               full_fname(dir), strerror(errno));
+                       rsyserr(FERROR, errno, "push_dir#4 %s failed",
+                               full_fname(dir));
                        exit_cleanup(RERR_FILESELECT);
                }
        }
@@ -636,11 +638,10 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
                exit_cleanup(status);
        }
 
-       if (argc == 0) {
+       if (argc == 0)
                list_only = 1;
-       }
 
-       if (!write_batch)
+       if (!read_batch)
                send_exclude_list(f_out);
 
        if (filesfrom_fd >= 0) {