Changed human_num() to big_num() with an extra arg so that it can

[rsync/rsync.git] / io.c

diff --git a/io.c b/io.c
index ce675d2..6e5c232 100644 (file)
--- a/io.c
+++ b/io.c
@@ -352,8 +352,7 @@ static void check_for_d_option_error(const char *msg)
 
        if (saw_d) {
                rprintf(FWARNING,
-                       "*** Try adding \"-r --exclude='/*/*'\" "
-                       "if remote rsync is <= 2.6.3 ***\n");
+                   "*** Try using \"--old-d\" if remote rsync is <= 2.6.3 ***\n");
        }
 }
 
@@ -409,7 +408,7 @@ static void read_msg_fd(void)
                /* Read extra file list from receiver. */
                assert(iobuf_in != NULL);
                assert(iobuf_f_in == fd);
-               if (verbose > 3) {
+               if (DEBUG_GTE(FLIST, 2)) {
                        rprintf(FINFO, "[%s] receiving flist for dir %d\n",
                                who_am_i(), IVAL(buf,0));
                }
@@ -630,8 +629,8 @@ static void whine_about_eof(int fd)
        }
 
        rprintf(FERROR, RSYNC_NAME ": connection unexpectedly closed "
-               "(%.0f bytes received so far) [%s]\n",
-               (double)stats.total_read, who_am_i());
+               "(%s bytes received so far) [%s]\n",
+               big_num(stats.total_read, 0), who_am_i());
 
        exit_cleanup(RERR_STREAMIO);
 }
@@ -874,8 +873,8 @@ int read_line(int fd, char *buf, size_t bufsiz, int flags)
        return s - buf;
 }
 
-int read_args(int f_in, char *mod_name, char *buf, size_t bufsiz, int rl_nulls,
-             char ***argv_p, int *argc_p, char **request_p)
+void read_args(int f_in, char *mod_name, char *buf, size_t bufsiz, int rl_nulls,
+              char ***argv_p, int *argc_p, char **request_p)
 {
        int maxargs = MAX_ARGS;
        int dot_pos = 0;
@@ -889,14 +888,14 @@ int read_args(int f_in, char *mod_name, char *buf, size_t bufsiz, int rl_nulls,
 
        if (!(argv = new_array(char *, maxargs)))
                out_of_memory("read_args");
-       if (mod_name)
+       if (mod_name && !protect_args)
                argv[argc++] = "rsyncd";
 
        while (1) {
                if (read_line(f_in, buf, bufsiz, rl_flags) == 0)
                        break;
 
-               if (argc == maxargs) {
+               if (argc == maxargs-1) {
                        maxargs += MAX_ARGS;
                        if (!(argv = realloc_array(argv, char *, maxargs)))
                                out_of_memory("read_args");
@@ -919,11 +918,12 @@ int read_args(int f_in, char *mod_name, char *buf, size_t bufsiz, int rl_nulls,
                                dot_pos = argc;
                }
        }
+       argv[argc] = NULL;
+
+       glob_expand(NULL, NULL, NULL, NULL);
 
        *argc_p = argc;
        *argv_p = argv;
-
-       return dot_pos ? dot_pos : argc;
 }
 
 int io_start_buffering_out(int f_out)
@@ -1354,6 +1354,7 @@ int read_vstring(int f, char *buf, int bufsize)
  * called by both the sender and the receiver. */
 void read_sum_head(int f, struct sum_struct *sum)
 {
+       int32 max_blength = protocol_version < 30 ? OLD_MAX_BLOCK_SIZE : MAX_BLOCK_SIZE;
        sum->count = read_int(f);
        if (sum->count < 0) {
                rprintf(FERROR, "Invalid checksum count %ld [%s]\n",
@@ -1361,7 +1362,7 @@ void read_sum_head(int f, struct sum_struct *sum)
                exit_cleanup(RERR_PROTOCOL);
        }
        sum->blength = read_int(f);
-       if (sum->blength < 0 || sum->blength > MAX_BLOCK_SIZE) {
+       if (sum->blength < 0 || sum->blength > max_blength) {
                rprintf(FERROR, "Invalid block length %ld [%s]\n",
                        (long)sum->blength, who_am_i());
                exit_cleanup(RERR_PROTOCOL);