Handle --delay-updates at the end of the first phase.

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index 3998822..74990ec 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -125,10 +125,25 @@ void successful_send(int ndx)
        }
 }
 
+static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
+                               uchar fnamecmp_type, char *buf, int len)
+{
+       write_int(f_out, ndx);
+       if (protocol_version < 29)
+               return;
+       write_shortint(f_out, iflags);
+       if (iflags & ITEM_BASIS_TYPE_FOLLOWS)
+               write_byte(f_out, fnamecmp_type);
+       if (iflags & ITEM_XNAME_FOLLOWS)
+               write_vstring(f_out, buf, len);
+}
+
 /* 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 read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr,
+                   char *buf, int *len_ptr)
 {
        int len;
+       uchar fnamecmp_type = FNAMECMP_FNAME;
        int iflags = protocol_version >= 29 ? read_shortint(f_in)
                   : ITEM_TRANSFER | ITEM_MISSING_DATA;
        int isave = iflags; /* XXX remove soon */
@@ -137,45 +152,45 @@ int read_iflags(int f_in, int f_out, int ndx, char *buf)
        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",
+               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());
+               rprintf(FERROR, "Invalid itemized flag word: %x [%s]\n",
+                       iflags, who_am_i());
                exit_cleanup(RERR_PROTOCOL);
        }
 
-       if (iflags & ITEM_HARD_LINKED)
-               len = read_vstring(f_in, buf, MAXPATHLEN);
-       else {
+       if (iflags & ITEM_BASIS_TYPE_FOLLOWS)
+               fnamecmp_type = read_byte(f_in);
+       *type_ptr = fnamecmp_type;
+
+       if (iflags & ITEM_XNAME_FOLLOWS) {
+               if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0)
+                       exit_cleanup(RERR_PROTOCOL);
+       } else {
                *buf = '\0';
                len = -1;
        }
+       *len_ptr = len;
 
-       /* XXX Temporary compatibility hack */
-       if (iflags & ITEM_REPORT_XATTRS) { /* old ITEM_UPDATE */
-               iflags &= ~ITEM_REPORT_XATTRS;
-               if (!(iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE))) {
-                       if (S_ISREG(the_file_list->files[ndx]->mode))
-                               iflags |= ITEM_TRANSFER;
-                       else
-                               iflags |= ITEM_LOCAL_CHANGE;
-               }
+       /* XXX Temporary backward compatibility when talking to 2.6.4pre[12] */
+       if (protocol_version >= 29 && iflags & ITEM_TRANSFER
+           && !S_ISREG(the_file_list->files[ndx]->mode)) {
+               iflags &= ~ITEM_TRANSFER;
+               iflags |= ITEM_LOCAL_CHANGE;
        }
 
        if (iflags & ITEM_TRANSFER) {
                if (!S_ISREG(the_file_list->files[ndx]->mode)) {
                        rprintf(FERROR,
-                               "received index of non-regular file: %d [%s]\n",
+                               "received request to transfer non-regular file: %d [%s]\n",
                                ndx, who_am_i());
                        exit_cleanup(RERR_PROTOCOL);
                }
        } else if (f_out >= 0) {
-               write_int(f_out, ndx);
-               write_shortint(f_out, isave /*XXX iflags */);
-               if (len >= 0)
-                       write_vstring(f_out, buf, len);
+               write_ndx_and_attrs(f_out, ndx, isave /*XXX iflags */,
+                                   fnamecmp_type, buf, len);
        }
 
        return iflags;
@@ -188,8 +203,9 @@ 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;
+       char xname[MAXPATHLEN];
+       uchar fnamecmp_type;
+       int iflags, xlen;
        struct file_struct *file;
        int phase = 0;
        struct stats initial_stats;
@@ -220,7 +236,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                        break;
                }
 
-               iflags = read_iflags(f_in, f_out, i, fnametmp);
+               iflags = read_item_attrs(f_in, f_out, i, &fnamecmp_type,
+                                        xname, &xlen);
                if (iflags == ITEM_IS_NEW) /* no-op packet */
                        continue;
 
@@ -238,14 +255,12 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                        rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
 
                if (!(iflags & ITEM_TRANSFER)) {
-                       maybe_log_item(file, iflags, itemizing, fnametmp);
+                       maybe_log_item(file, iflags, itemizing, xname);
                        continue;
                }
 
-               if (inplace && protocol_version >= 29) {
-                       updating_basis_file = !(iflags & ITEM_USING_ALT_BASIS);
-               } else
-                       updating_basis_file = inplace && !make_backups;
+               updating_basis_file = inplace && (protocol_version >= 29
+                       ? fnamecmp_type == FNAMECMP_FNAME : !make_backups);
 
                stats.current_file_index = i;
                stats.num_transferred_files++;
@@ -254,9 +269,8 @@ 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_item(file, &stats, iflags, NULL);
-                       write_int(f_out, i);
-                       if (protocol_version >= 29)
-                               write_shortint(f_out, iflags | ITEM_REPORT_XATTRS);
+                       write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
+                                           xname, xlen);
                        continue;
                }
 
@@ -307,9 +321,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                                safe_fname(fname), (double)st.st_size);
                }
 
-               write_int(f_out, i);
-               if (protocol_version >= 29)
-                       write_shortint(f_out, iflags | ITEM_REPORT_XATTRS);
+               write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
+                                   xname, xlen);
                write_sum_head(f_out, s);
 
                if (verbose > 2) {