Added skipping of mkstemp() on HP-UX.

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index ec0e04d..b991500 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -291,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)
@@ -923,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;
@@ -1186,6 +1205,8 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 
                if (allowed_lull && !(i % lull_mod))
                        maybe_send_keepalive();
+               else if (!(i % 50))
+                       maybe_flush_socket();
        }
        recv_generator(NULL, NULL, 0, 0, 0, code, -1);
        if (delete_during)
@@ -1259,8 +1280,10 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
                                continue;
                        recv_generator(f_name(file), file, i, itemizing,
                                       maybe_PERMS_REPORT, code, -1);
-                       if (allowed_lull && !(j++ % lull_mod))
+                       if (allowed_lull && !(++j % lull_mod))
                                maybe_send_keepalive();
+                       else if (!(j % 50))
+                               maybe_flush_socket();
                }
        }
        recv_generator(NULL, NULL, 0, 0, 0, code, -1);