Moved "port" and "address" into the global section where they

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 92954d4..a4a54a0 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -25,12 +25,14 @@
 
 extern int verbose;
 extern int dry_run;
+extern int do_xfers;
 extern int log_format_has_i;
 extern int log_format_has_o_or_i;
 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 +50,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 +72,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 +292,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)
@@ -664,7 +668,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
        if (only_existing && statret == -1 && stat_errno == ENOENT) {
                /* we only want to update existing files */
                if (verbose > 1) {
-                       rprintf(FINFO, "not creating new file \"%s\"\n",
+                       rprintf(FINFO, "not creating new %s \"%s\"\n",
+                               S_ISDIR(file->mode) ? "directory" : "file",
                                safe_fname(fname));
                }
                return;
@@ -922,8 +927,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;
@@ -1000,7 +1022,7 @@ prepare_to_open:
                statret = 0;
        }
 
-       if (dry_run || read_batch || whole_file)
+       if (!do_xfers || read_batch || whole_file)
                goto notify_others;
 
        if (fuzzy_basis) {
@@ -1072,7 +1094,7 @@ notify_others:
                        fuzzy_file ? fuzzy_file->basename : NULL);
        }
 
-       if (dry_run) {
+       if (!do_xfers) {
                if (preserve_hard_links && file->link_u.links)
                        hard_link_cluster(file, ndx, itemizing, code);
                return;
@@ -1111,6 +1133,8 @@ 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;
+       int save_make_backups = make_backups;
 
        allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2;
        lull_mod = allowed_lull * 5;
@@ -1120,9 +1144,9 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
                maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
                code = daemon_log_format_has_i ? 0 : FLOG;
        } else if (am_daemon) {
-               itemizing = daemon_log_format_has_i && !dry_run;
+               itemizing = daemon_log_format_has_i && do_xfers;
                maybe_PERMS_REPORT = PERMS_REPORT;
-               code = itemizing || dry_run ? FCLIENT : FINFO;
+               code = itemizing || !do_xfers ? FCLIENT : FINFO;
        } else if (!am_server) {
                itemizing = log_format_has_i;
                maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
@@ -1140,6 +1164,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;
@@ -1166,7 +1191,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) {
@@ -1182,6 +1208,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 % 200))
+                       maybe_flush_socket();
        }
        recv_generator(NULL, NULL, 0, 0, 0, code, -1);
        if (delete_during)
@@ -1215,11 +1243,15 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
        phase++;
        only_existing = save_only_existing;
        opt_ignore_existing = save_opt_ignore_existing;
+       make_backups = save_make_backups;
 
        if (verbose > 2)
                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 MSG_DONE for the redo phase (and any prior messages). */
        get_redo_num(itemizing, code);
@@ -1228,11 +1260,13 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
                phase++;
                if (verbose > 2)
                        rprintf(FINFO, "generate_files phase=%d\n", phase);
-               write_int(f_out, -1);
-               /* Read MSG_DONE for delay-update phase & prior messages. */
+               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);
 
@@ -1250,8 +1284,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 % 200))
+                               maybe_flush_socket();
                }
        }
        recv_generator(NULL, NULL, 0, 0, 0, code, -1);