If --remove-sent-files was specified and we successfully updated a

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index 30640f1..470b824 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -20,18 +20,21 @@
 #include "rsync.h"
 
 extern int verbose;
-extern int itemize_changes;
-extern int csum_length;
-extern struct stats stats;
-extern int io_error;
 extern int dry_run;
 extern int am_server;
 extern int am_daemon;
+extern int log_before_transfer;
+extern int log_format_has_i;
+extern int daemon_log_format_has_i;
+extern int csum_length;
+extern int io_error;
 extern int protocol_version;
 extern int updating_basis_file;
 extern int make_backups;
+extern int do_progress;
 extern int inplace;
 extern struct stats stats;
+extern char *log_format;
 
 
 /**
@@ -104,12 +107,14 @@ 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];
-       int i;
+       int iflags;
        struct file_struct *file;
        int phase = 0;
        struct stats initial_stats;
        int save_make_backups = make_backups;
-       int j;
+       int itemizing = am_daemon ? daemon_log_format_has_i
+                     : !am_server && log_format_has_i;
+       int i, j;
 
        if (verbose > 2)
                rprintf(FINFO, "send_files starting\n");
@@ -139,15 +144,45 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                        exit_cleanup(RERR_PROTOCOL);
                }
 
+               file = flist->files[i];
+               if (file->dir.root) {
+                       /* N.B. We're sure that this fits, so offset is OK. */
+                       offset = strlcpy(fname, file->dir.root, sizeof fname);
+                       if (!offset || fname[offset-1] != '/')
+                               fname[offset++] = '/';
+               } else
+                       offset = 0;
+               fname2 = f_name_to(file, fname + offset);
+
+               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 (inplace && protocol_version >= 29) {
                        uchar fnamecmp_type = read_byte(f_in);
                        updating_basis_file = fnamecmp_type == FNAMECMP_FNAME;
                } else
                        updating_basis_file = inplace && !make_backups;
 
-               file = flist->files[i];
-               if (S_ISDIR(file->mode)) {
-                       rprintf(FERROR, "[%s] got index of directory: %d\n",
+               if (!S_ISREG(file->mode)) {
+                       rprintf(FERROR, "[%s] got index of non-regular file: %d\n",
                                who_am_i(), i);
                        exit_cleanup(RERR_PROTOCOL);
                }
@@ -156,22 +191,12 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                stats.num_transferred_files++;
                stats.total_transferred_size += file->length;
 
-               if (file->dir.root) {
-                       /* N.B. We're sure that this fits, so offset is OK. */
-                       offset = strlcpy(fname, file->dir.root, sizeof fname);
-                       if (!offset || fname[offset-1] != '/')
-                               fname[offset++] = '/';
-               } else
-                       offset = 0;
-               fname2 = f_name_to(file, fname + offset);
-
-               if (verbose > 2)
-                       rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
-
                if (dry_run) { /* log the transfer */
-                       if (!am_server && verbose && !itemize_changes)
-                               rprintf(FINFO, "%s\n", safe_fname(fname2));
+                       if (!am_server && log_format)
+                               log_send(file, &stats, iflags);
                        write_int(f_out, i);
+                       if (protocol_version >= 29)
+                               write_shortint(f_out, iflags);
                        continue;
                }
 
@@ -223,6 +248,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                }
 
                write_int(f_out, i);
+               if (protocol_version >= 29)
+                       write_shortint(f_out, iflags);
                write_sum_head(f_out, s);
 
                if (verbose > 2) {
@@ -230,14 +257,16 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                                safe_fname(fname));
                }
 
-               /* log the transfer */
-               if (!am_server && verbose && !itemize_changes)
+               if (log_before_transfer)
+                       log_send(file, &initial_stats, iflags);
+               else if (!am_server && verbose && do_progress)
                        rprintf(FINFO, "%s\n", safe_fname(fname2));
 
                set_compression(fname);
 
                match_sums(f_out, s, mbuf, st.st_size);
-               log_send(file, &initial_stats);
+               if (!log_before_transfer)
+                       log_send(file, &initial_stats, iflags);
 
                if (mbuf) {
                        j = unmap_file(mbuf);