- Replaced log_send() and log_recv() with log_item().

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index 470b824..9ba8211 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -29,11 +29,13 @@ extern int daemon_log_format_has_i;
 extern int csum_length;
 extern int io_error;
 extern int protocol_version;
+extern int remove_sent_files;
 extern int updating_basis_file;
 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;
 
 
@@ -98,7 +100,30 @@ static struct sum_struct *receive_sums(int f)
        return s;
 }
 
-
+void successful_send(int ndx)
+{
+       char fname[MAXPATHLEN];
+       struct file_struct *file;
+       unsigned int offset;
+
+       if (ndx < 0 || ndx >= the_file_list->count)
+               return;
+
+       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;
+       if (file->dir.root) {
+               offset = stringjoin(fname, sizeof fname,
+                                   file->dir.root, "/", NULL);
+       } else
+               offset = 0;
+       f_name_to(file, fname + offset);
+       if (remove_sent_files && do_unlink(fname) == 0 && verbose > 1) {
+               rprintf(FINFO, "sender removed %s\n",
+                       safe_fname(fname + offset));
+       }
+}
 
 void send_files(struct file_list *flist, int f_out, int f_in)
 {
@@ -139,6 +164,13 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                }
 
                if (i < 0 || i >= flist->count) {
+                       /* Handle the new keep-alive (no-op) packet. */
+                       if (i == flist->count && protocol_version >= 29
+                           && read_shortint(f_in) == ITEM_IS_NEW) {
+                               write_int(f_out, i);
+                               write_shortint(f_out, ITEM_IS_NEW);
+                               continue;
+                       }
                        rprintf(FERROR, "Invalid file index %d (count=%d)\n",
                                i, flist->count);
                        exit_cleanup(RERR_PROTOCOL);
@@ -176,8 +208,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                        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;
+                       updating_basis_file = !(iflags & ITEM_USING_ALT_BASIS);
                } else
                        updating_basis_file = inplace && !make_backups;
 
@@ -285,6 +316,9 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                        rprintf(FINFO, "sender finished %s\n",
                                safe_fname(fname));
                }
+
+               /* Flag that we actually sent this entry. */
+               file->flags |= FLAG_SENT;
        }
        make_backups = save_make_backups;