Moved some code out of the main loop in send_files() into a new

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index db42856..35955c7 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -35,6 +35,7 @@ extern int make_backups;
 extern int do_progress;
 extern int inplace;
 extern struct stats stats;
+extern struct file_list *the_file_list;
 extern char *log_format;
 
 
@@ -99,18 +100,16 @@ static struct sum_struct *receive_sums(int f)
        return s;
 }
 
-static struct file_list *the_flist;
-
-void successful_send(int i)
+void successful_send(int ndx)
 {
        char fname[MAXPATHLEN];
        struct file_struct *file;
        unsigned int offset;
 
-       if (!the_flist || i < 0 || i >= the_flist->count)
+       if (ndx < 0 || ndx >= the_file_list->count)
                return;
 
-       file = the_flist->files[i];
+       file = the_file_list->files[ndx];
        /* The generator might tell us about symlinks we didn't send. */
        if (!(file->flags & FLAG_SENT) && !S_ISLNK(file->mode))
                return;
@@ -126,6 +125,33 @@ void successful_send(int i)
        }
 }
 
+/* This is also used by receive.c with f_out = -1. */
+int read_iflags(int f_in, int f_out, int ndx, char *buf)
+{
+       int iflags = protocol_version >= 29 ? read_shortint(f_in)
+                  : ITEM_UPDATING | ITEM_MISSING_DATA;
+
+       /* Handle the new keep-alive (no-op) packet. */
+       if (ndx == the_file_list->count && iflags == ITEM_IS_NEW)
+               ;
+       else if (ndx < 0 || ndx >= the_file_list->count) {
+               rprintf(FERROR, "Invalid file index %d (count=%d) [%s]\n",
+                       ndx, the_file_list->count, who_am_i());
+               exit_cleanup(RERR_PROTOCOL);
+       } else if (iflags == ITEM_IS_NEW) {
+               rprintf(FERROR, "Invalid itemized flag word [%s]\n",
+                       who_am_i());
+               exit_cleanup(RERR_PROTOCOL);
+       }
+
+       if ((!(iflags & ITEM_UPDATING) || !S_ISREG(the_file_list->files[ndx]->mode)) && f_out >= 0) {
+               write_int(f_out, ndx);
+               write_shortint(f_out, iflags);
+       }
+
+       return iflags;
+}
+
 void send_files(struct file_list *flist, int f_out, int f_in)
 {
        int fd = -1;
@@ -133,6 +159,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
        struct map_struct *mbuf = NULL;
        STRUCT_STAT st;
        char *fname2, fname[MAXPATHLEN];
+       char fnametmp[MAXPATHLEN];
        int iflags;
        struct file_struct *file;
        int phase = 0;
@@ -145,8 +172,6 @@ void send_files(struct file_list *flist, int f_out, int f_in)
        if (verbose > 2)
                rprintf(FINFO, "send_files starting\n");
 
-       the_flist = flist;
-
        while (1) {
                unsigned int offset;
 
@@ -166,11 +191,9 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                        break;
                }
 
-               if (i < 0 || i >= flist->count) {
-                       rprintf(FERROR, "Invalid file index %d (count=%d)\n",
-                               i, flist->count);
-                       exit_cleanup(RERR_PROTOCOL);
-               }
+               iflags = read_iflags(f_in, f_out, i, fnametmp);
+               if (iflags == ITEM_IS_NEW) /* no-op packet */
+                       continue;
 
                file = flist->files[i];
                if (file->dir.root) {
@@ -185,27 +208,13 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                if (verbose > 2)
                        rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
 
-               if (protocol_version >= 29) {
-                       iflags = read_shortint(f_in);
-                       if (!(iflags & ITEM_UPDATING) || !S_ISREG(file->mode)) {
-                               int see_item = itemizing && (iflags || verbose > 1);
-                               write_int(f_out, i);
-                               write_shortint(f_out, iflags);
-                               if (am_server) {
-                                       if (am_daemon && !dry_run && see_item)
-                                               log_send(file, &stats, iflags);
-                               } else if (see_item || iflags & ITEM_UPDATING
-                                   || (S_ISDIR(file->mode)
-                                    && iflags & ITEM_REPORT_TIME))
-                                       log_send(file, &stats, iflags);
-                               continue;
-                       }
-               } else
-                       iflags = ITEM_UPDATING | ITEM_MISSING_DATA;
+               if (!(iflags & ITEM_UPDATING) || !S_ISREG(file->mode)) {
+                       maybe_log_item(file, iflags, itemizing, fnametmp);
+                       continue;
+               }
 
                if (inplace && protocol_version >= 29) {
-                       uchar fnamecmp_type = read_byte(f_in);
-                       updating_basis_file = fnamecmp_type == FNAMECMP_FNAME;
+                       updating_basis_file = !(iflags & ITEM_USING_ALT_BASIS);
                } else
                        updating_basis_file = inplace && !make_backups;
 
@@ -221,7 +230,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
                if (dry_run) { /* log the transfer */
                        if (!am_server && log_format)
-                               log_send(file, &stats, iflags);
+                               log_item(file, &stats, iflags, NULL);
                        write_int(f_out, i);
                        if (protocol_version >= 29)
                                write_shortint(f_out, iflags);
@@ -286,7 +295,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                }
 
                if (log_before_transfer)
-                       log_send(file, &initial_stats, iflags);
+                       log_item(file, &initial_stats, iflags, NULL);
                else if (!am_server && verbose && do_progress)
                        rprintf(FINFO, "%s\n", safe_fname(fname2));
 
@@ -294,7 +303,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
                match_sums(f_out, s, mbuf, st.st_size);
                if (!log_before_transfer)
-                       log_send(file, &initial_stats, iflags);
+                       log_item(file, &initial_stats, iflags, NULL);
 
                if (mbuf) {
                        j = unmap_file(mbuf);