Split up the ifuncs.h file into 3 .h files.

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index d11437f..766f1b3 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -23,6 +23,7 @@
 #include "rsync.h"
 #include "ifuncs.h"
 #include "rounding.h"
+#include "inums.h"
 #include "io.h"
 
 extern int am_root;
@@ -321,7 +322,7 @@ static void flist_expand(struct file_list *flist, int extra)
        if (DEBUG_GTE(FLIST, 1) && flist->malloced != FLIST_START) {
                rprintf(FCLIENT, "[%s] expand file_list pointer array to %s bytes, did%s move\n",
                    who_am_i(),
-                   big_num(sizeof flist->files[0] * flist->malloced, 0),
+                   big_num(sizeof flist->files[0] * flist->malloced),
                    (new_ptr == flist->files) ? " not" : "");
        }
 
@@ -488,7 +489,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
                                } else if (DEBUG_GTE(HLINK, 3)) {
                                        rprintf(FINFO, "[%s] dev:inode for #%d is %s:%s\n",
                                                who_am_i(), first_ndx + ndx,
-                                               big_num(tmp_dev, 0), big_num(tmp_ino, 0));
+                                               big_num(tmp_dev), big_num(tmp_ino));
                                }
                        }
                } else {
@@ -1916,7 +1917,12 @@ void send_extra_file_list(int f, int at_least)
                        dp = F_DIR_NODE_P(file);
                }
 
-               write_byte(f, 0);
+               if (protocol_version < 31 || io_error == save_io_error || ignore_errors)
+                       write_byte(f, 0);
+               else {
+                       write_shortint(f, XMIT_EXTENDED_FLAGS|XMIT_IO_ERROR_ENDLIST);
+                       write_int(f, io_error);
+               }
 
                if (need_unsorted_flist) {
                        if (!(flist->sorted = new_array(struct file_struct *, flist->used)))
@@ -1957,7 +1963,7 @@ void send_extra_file_list(int f, int at_least)
        }
 
   finish:
-       if (io_error != save_io_error && !ignore_errors)
+       if (io_error != save_io_error && protocol_version == 30 && !ignore_errors)
                send_msg_int(MSG_IO_ERROR, io_error);
 }
 
@@ -2213,7 +2219,13 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                stats.flist_buildtime = 1;
        start_tv = end_tv;
 
-       write_byte(f, 0); /* Indicate end of file list */
+       /* Indicate end of file list */
+       if (protocol_version < 31 || io_error == 0 || ignore_errors)
+               write_byte(f, 0);
+       else {
+               write_shortint(f, XMIT_EXTENDED_FLAGS|XMIT_IO_ERROR_ENDLIST);
+               write_int(f, io_error);
+       }
 
 #ifdef SUPPORT_HARD_LINKS
        if (preserve_hard_links && protocol_version >= 30 && !inc_recurse)
@@ -2251,7 +2263,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
        /* send the io_error flag */
        if (protocol_version < 30)
                write_int(f, ignore_errors ? 0 : io_error);
-       else if (io_error && !ignore_errors)
+       else if (io_error && protocol_version == 30 && !ignore_errors)
                send_msg_int(MSG_IO_ERROR, io_error);
 
        if (disable_buffering)
@@ -2322,10 +2334,22 @@ struct file_list *recv_file_list(int f)
        while ((flags = read_byte(f)) != 0) {
                struct file_struct *file;
 
-               flist_expand(flist, 1);
-
                if (protocol_version >= 28 && (flags & XMIT_EXTENDED_FLAGS))
                        flags |= read_byte(f) << 8;
+
+               if (flags == (XMIT_EXTENDED_FLAGS|XMIT_IO_ERROR_ENDLIST)) {
+                       int err;
+                       if (protocol_version < 31) {
+                               rprintf(FERROR, "Invalid flist flag: %x\n", flags);
+                               exit_cleanup(RERR_PROTOCOL);
+                       }
+                       err = read_int(f);
+                       if (!ignore_errors)
+                               io_error |= err;
+                       break;
+               }
+
+               flist_expand(flist, 1);
                file = recv_file_entry(flist, flags, f);
 
                if (inc_recurse && S_ISDIR(file->mode)) {
@@ -2389,10 +2413,9 @@ struct file_list *recv_file_list(int f)
 
        if (protocol_version < 30) {
                /* Recv the io_error flag */
-               if (ignore_errors)
-                       read_int(f);
-               else
-                       io_error |= read_int(f);
+               int err = read_int(f);
+               if (!ignore_errors)
+                       io_error |= err;
        } else if (inc_recurse && flist->ndx_start == 1) {
                if (!file_total || strcmp(flist->sorted[flist->low]->basename, ".") != 0)
                        flist->parent_ndx = -1;
@@ -2797,7 +2820,7 @@ static void output_flist(struct file_list *flist)
                        "[%s] i=%d %s %s%s%s%s mode=0%o len=%s%s%s flags=%x\n",
                        who, i + flist->ndx_start,
                        root, dir, slash, name, trail,
-                       (int)file->mode, big_num(F_LENGTH(file), 0),
+                       (int)file->mode, comma_num(F_LENGTH(file)),
                        uidbuf, gidbuf, file->flags);
        }
 }