When doing a delete pass with do_progress output, get rid of the

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 9a27c13..245690c 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -31,6 +31,7 @@ extern int daemon_log_format_has_i;
 extern int am_root;
 extern int am_server;
 extern int am_daemon;
+extern int do_progress;
 extern int recurse;
 extern int relative_paths;
 extern int keep_dirlinks;
@@ -48,6 +49,7 @@ extern int delete_after;
 extern int module_id;
 extern int ignore_errors;
 extern int remove_sent_files;
+extern int delay_updates;
 extern int update_only;
 extern int opt_ignore_existing;
 extern int inplace;
@@ -69,7 +71,6 @@ extern int compare_dest;
 extern int copy_dest;
 extern int link_dest;
 extern int whole_file;
-extern int local_server;
 extern int list_only;
 extern int read_batch;
 extern int only_existing;
@@ -290,6 +291,8 @@ static void do_delete_pass(struct file_list *flist)
 
                delete_in_dir(flist, fbuf, file);
        }
+       if (do_progress && !am_server)
+               rprintf(FINFO, "                    \r");
 }
 
 static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
@@ -337,8 +340,6 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
        if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
          || (xname && *xname)) && !read_batch) {
                if (protocol_version >= 29) {
-                       if (iflags & (ITEM_LOCAL_CHANGE|ITEM_TRANSFER))/* XXX */
-                               iflags |= ITEM_DUMMY_BIT; /* XXX Remove soon */
                        if (ndx >= 0)
                                write_int(sock_f_out, ndx);
                        write_shortint(sock_f_out, iflags);
@@ -507,7 +508,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
 {
        int fname_len, fname_suf_len;
        const char *fname_suf, *fname = file->basename;
-       uint32 lowest_dist = 0x7FFFFFFF;
+       uint32 lowest_dist = 25 << 16; /* ignore a distance greater than 25 */
        int j, lowest_j = -1;
 
        fname_len = strlen(fname);
@@ -924,8 +925,25 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                                        }
                                        match_level = 0;
                                        statret = -1;
-                               } else
-                                       set_perms(fname, file, NULL, 0);
+                               } else {
+                                       if (itemizing) {
+                                               itemize(file, ndx, 0, &st,
+                                                       ITEM_LOCAL_CHANGE, 0,
+                                                       NULL);
+                                       } else if (verbose && code) {
+                                               rprintf(code, "%s\n",
+                                                       safe_fname(fname));
+                                       }
+                                       set_perms(fname, file, NULL,
+                                                 maybe_PERMS_REPORT);
+                                       if (preserve_hard_links
+                                           && file->link_u.links) {
+                                               hard_link_cluster(file, ndx,
+                                                                 itemizing,
+                                                                 code);
+                                       }
+                                       return;
+                               }
                        } else if (compare_dest || match_level == 1) {
                                fnamecmp = fnamecmpbuf;
                                fnamecmp_type = i;
@@ -1113,6 +1131,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
        int need_retouch_dir_perms = 0;
        int save_only_existing = only_existing;
        int save_opt_ignore_existing = opt_ignore_existing;
+       int save_do_progress = do_progress;
 
        allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2;
        lull_mod = allowed_lull * 5;
@@ -1142,6 +1161,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 
        if (delete_before && !local_name && flist->count > 0)
                do_delete_pass(flist);
+       do_progress = 0;
 
        if (whole_file < 0)
                whole_file = 0;
@@ -1168,7 +1188,8 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
                /* We need to ensure that any dirs we create have writeable
                 * permissions during the time we are putting files within
                 * them.  This is then fixed after the transfer is done. */
-               if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)) {
+               if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)
+                   && !list_only) {
                        int mode = file->mode | S_IWUSR; /* user write */
                        char *fname = local_name ? local_name : fbuf;
                        if (do_chmod(fname, mode & CHMOD_BITS) < 0) {
@@ -1222,10 +1243,24 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
                rprintf(FINFO,"generate_files phase=%d\n",phase);
 
        write_int(f_out, -1);
+       /* Reduce round-trip lag-time for a useless delay-updates phase. */
+       if (protocol_version >= 29 && !delay_updates)
+               write_int(f_out, -1);
 
-       /* Read post-redo-phase MSG_DONE and any prior messages. */
+       /* Read MSG_DONE for the redo phase (and any prior messages). */
        get_redo_num(itemizing, code);
 
+       if (protocol_version >= 29) {
+               phase++;
+               if (verbose > 2)
+                       rprintf(FINFO, "generate_files phase=%d\n", phase);
+               if (delay_updates)
+                       write_int(f_out, -1);
+               /* Read MSG_DONE for delay-updates phase & prior messages. */
+               get_redo_num(itemizing, code);
+       }
+
+       do_progress = save_do_progress;
        if (delete_after && !local_name && flist->count > 0)
                do_delete_pass(flist);
 
@@ -1256,12 +1291,6 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
                io_error |= IOERR_DEL_LIMIT;
        }
 
-       if (protocol_version >= 29) {
-               write_int(f_out, -1);
-               /* Read post-delay-phase MSG_DONE and any prior messages. */
-               get_redo_num(itemizing, code);
-       }
-
        if (verbose > 2)
                rprintf(FINFO,"generate_files finished\n");
 }