We now look for the ITEM_USING_ALT_BASIS flag for an --inplace

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index e568368..e771a9e 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -21,21 +21,21 @@
 
 extern int verbose;
 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 am_server;
-extern int am_daemon;
 extern int csum_length;
-extern struct stats stats;
 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 char *log_format;
 extern struct stats stats;
+extern char *log_format;
 
 
 /**
@@ -99,7 +99,32 @@ static struct sum_struct *receive_sums(int f)
        return s;
 }
 
+static struct file_list *the_flist;
 
+void successful_send(int i)
+{
+       char fname[MAXPATHLEN];
+       struct file_struct *file;
+       unsigned int offset;
+
+       if (!the_flist || i < 0 || i >= the_flist->count)
+               return;
+
+       file = the_flist->files[i];
+       /* 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)
 {
@@ -120,6 +145,8 @@ 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;
 
@@ -177,8 +204,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;
 
@@ -286,6 +312,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;