From 47c1197534c3247a2669df86fbc36d4094d6ba93 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Fri, 30 Jun 2006 15:52:52 +0000 Subject: [PATCH] Decided that I like remove-source-files better than remove-sender-files. --- generator.c | 16 ++++++++-------- hlink.c | 6 +++--- io.c | 8 ++++---- main.c | 6 +++--- options.c | 18 +++++++++--------- receiver.c | 6 +++--- rsync.yo | 4 ++-- sender.c | 4 ++-- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/generator.c b/generator.c index 470720ae..ae7c0ea2 100644 --- a/generator.c +++ b/generator.c @@ -50,7 +50,7 @@ extern int delete_during; extern int delete_after; extern int module_id; extern int ignore_errors; -extern int remove_sender_files; +extern int remove_source_files; extern int delay_updates; extern int update_only; extern int ignore_existing; @@ -986,7 +986,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, itemizing, code); } - if (remove_sender_files == 1) + if (remove_source_files == 1) goto return_with_success; return; } @@ -1029,7 +1029,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } if (preserve_hard_links && file->link_u.links) hard_link_cluster(file, ndx, itemizing, code); - if (remove_sender_files) + if (remove_source_files) goto return_with_success; } #endif @@ -1084,7 +1084,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, hard_link_cluster(file, ndx, itemizing, code); } - if (remove_sender_files == 1) + if (remove_source_files == 1) goto return_with_success; } } else { @@ -1093,7 +1093,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT); if (preserve_hard_links && file->link_u.links) hard_link_cluster(file, ndx, itemizing, code); - if (remove_sender_files == 1) + if (remove_source_files == 1) goto return_with_success; } return; @@ -1150,7 +1150,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st, itemizing, maybe_ATTRS_REPORT, code); if (j == -2) { - if (remove_sender_files == 1) + if (remove_source_files == 1) goto return_with_success; return; } @@ -1219,7 +1219,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT); if (preserve_hard_links && file->link_u.links) hard_link_cluster(file, ndx, itemizing, code); - if (remove_sender_files != 1) + if (remove_source_files != 1) return; return_with_success: if (!dry_run) { @@ -1299,7 +1299,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, rprintf(FINFO, "generating and sending sums for %d\n", ndx); notify_others: - if (remove_sender_files && !delay_updates && !phase) + if (remove_source_files && !delay_updates && !phase) increment_active_files(ndx, itemizing, code); write_int(f_out, ndx); if (itemizing) { diff --git a/hlink.c b/hlink.c index 2cd1c6e0..cd0941ff 100644 --- a/hlink.c +++ b/hlink.c @@ -27,7 +27,7 @@ extern int verbose; extern int do_xfers; extern int link_dest; extern int make_backups; -extern int remove_sender_files; +extern int remove_source_files; extern int stdout_format_has_i; extern char *basis_dir[]; extern struct file_list *the_file_list; @@ -224,7 +224,7 @@ int hard_link_check(struct file_struct *file, int ndx, char *fname, } maybe_hard_link(file, ndx, fname, statret, st, toname, &st2, itemizing, code); - if (remove_sender_files == 1 && do_xfers) { + if (remove_source_files == 1 && do_xfers) { char numbuf[4]; SIVAL(numbuf, 0, ndx); send_msg(MSG_SUCCESS, numbuf, 4); @@ -294,7 +294,7 @@ void hard_link_cluster(struct file_struct *file, int master, int itemizing, statret = link_stat(hlink2, &st2, 0); maybe_hard_link(file, ndx, hlink2, statret, &st2, hlink1, &st1, itemizing, code); - if (remove_sender_files == 1 && do_xfers) { + if (remove_source_files == 1 && do_xfers) { char numbuf[4]; SIVAL(numbuf, 0, ndx); send_msg(MSG_SUCCESS, numbuf, 4); diff --git a/io.c b/io.c index 09a74589..2f5ffb0b 100644 --- a/io.c +++ b/io.c @@ -46,7 +46,7 @@ extern int read_batch; extern int csum_length; extern int checksum_seed; extern int protocol_version; -extern int remove_sender_files; +extern int remove_source_files; extern int preserve_hard_links; extern char *filesfrom_host; extern struct stats stats; @@ -257,7 +257,7 @@ static void read_msg_fd(void) exit_cleanup(RERR_STREAMIO); } read_loop(fd, buf, 4); - if (remove_sender_files) + if (remove_source_files) decrement_active_files(IVAL(buf,0)); flist_ndx_push(&redo_list, IVAL(buf,0)); break; @@ -275,7 +275,7 @@ static void read_msg_fd(void) exit_cleanup(RERR_STREAMIO); } read_loop(fd, buf, len); - if (remove_sender_files) { + if (remove_source_files) { decrement_active_files(IVAL(buf,0)); send_msg(MSG_SUCCESS, buf, len); } @@ -311,7 +311,7 @@ static void read_msg_fd(void) } /* This is used by the generator to limit how many file transfers can - * be active at once when --remove-sender-files is specified. Without + * be active at once when --remove-source-files is specified. Without * this, sender-side deletions were mostly happening at the end. */ void increment_active_files(int ndx, int itemizing, enum logcode code) { diff --git a/main.c b/main.c index 0a241a36..c37b3c79 100644 --- a/main.c +++ b/main.c @@ -35,7 +35,7 @@ extern int am_sender; extern int am_generator; extern int am_daemon; extern int blocking_io; -extern int remove_sender_files; +extern int remove_source_files; extern int daemon_over_rsh; extern int need_messages_from_generator; extern int kluge_around_eof; @@ -614,10 +614,10 @@ static void do_server_sender(int f_in, int f_out, int argc, char *argv[]) exit_cleanup(RERR_SYNTAX); return; } - if (am_daemon && lp_read_only(module_id) && remove_sender_files) { + if (am_daemon && lp_read_only(module_id) && remove_source_files) { rprintf(FERROR, "ERROR: --remove-%s-files cannot be used with a read-only module\n", - remove_sender_files == 1 ? "sender" : "sent"); + remove_source_files == 1 ? "source" : "sent"); exit_cleanup(RERR_SYNTAX); return; } diff --git a/options.c b/options.c index 72c4c8f5..4a5c65cd 100644 --- a/options.c +++ b/options.c @@ -65,7 +65,7 @@ int delete_during = 0; int delete_before = 0; int delete_after = 0; int delete_excluded = 0; -int remove_sender_files = 0; +int remove_source_files = 0; int one_file_system = 0; int protocol_version = PROTOCOL_VERSION; int sparse_files = 0; @@ -321,7 +321,7 @@ void usage(enum logcode F) rprintf(F," --rsync-path=PROGRAM specify the rsync to run on the remote machine\n"); rprintf(F," --existing skip creating new files on receiver\n"); rprintf(F," --ignore-existing skip updating files that already exist on receiver\n"); - rprintf(F," --remove-sender-files sender removes synchronized files (non-dirs)\n"); + rprintf(F," --remove-source-files sender removes synchronized files (non-dirs)\n"); rprintf(F," --del an alias for --delete-during\n"); rprintf(F," --delete delete extraneous files from destination dirs\n"); rprintf(F," --delete-before receiver deletes before transfer (default)\n"); @@ -475,8 +475,8 @@ static struct poptOption long_options[] = { {"delete-during", 0, POPT_ARG_NONE, &delete_during, 0, 0, 0 }, {"delete-after", 0, POPT_ARG_NONE, &delete_after, 0, 0, 0 }, {"delete-excluded", 0, POPT_ARG_NONE, &delete_excluded, 0, 0, 0 }, - {"remove-sent-files",0, POPT_ARG_VAL, &remove_sender_files, 2, 0, 0 }, /* deprecated */ - {"remove-sender-files",0,POPT_ARG_VAL, &remove_sender_files, 1, 0, 0 }, + {"remove-sent-files",0, POPT_ARG_VAL, &remove_source_files, 2, 0, 0 }, /* deprecated */ + {"remove-source-files",0,POPT_ARG_VAL, &remove_source_files, 1, 0, 0 }, {"force", 0, POPT_ARG_NONE, &force_delete, 0, 0, 0 }, {"ignore-errors", 0, POPT_ARG_NONE, &ignore_errors, 0, 0, 0 }, {"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 0, 0 }, @@ -1205,8 +1205,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain) return 0; } - if (remove_sender_files) { - /* We only want to infer this refusal of --remove-sender-files + if (remove_source_files) { + /* We only want to infer this refusal of --remove-source-files * via the refusal of "delete", not any of the "delete-FOO" * options. */ if (refused_delete && am_sender) { @@ -1757,9 +1757,9 @@ void server_options(char **args,int *argc) if (fuzzy_basis && am_sender) args[ac++] = "--fuzzy"; - if (remove_sender_files == 1) - args[ac++] = "--remove-sender-files"; - else if (remove_sender_files) + if (remove_source_files == 1) + args[ac++] = "--remove-source-files"; + else if (remove_source_files) args[ac++] = "--remove-sent-files"; *argc = ac; diff --git a/receiver.c b/receiver.c index c0326399..683a716c 100644 --- a/receiver.c +++ b/receiver.c @@ -40,7 +40,7 @@ extern int preserve_perms; extern int basis_dir_cnt; extern int make_backups; extern int cleanup_got_literal; -extern int remove_sender_files; +extern int remove_source_files; extern int append_mode; extern int sparse_files; extern int keep_partial; @@ -296,7 +296,7 @@ static void handle_delayed_updates(struct file_list *flist, char *local_name) "rename failed for %s (from %s)", full_fname(fname), partialptr); } else { - if (remove_sender_files + if (remove_source_files || (preserve_hard_links && file->link_u.links)) { SIVAL(numbuf, 0, i); @@ -644,7 +644,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) cleanup_disable(); if (recv_ok > 0) { - if (remove_sender_files + if (remove_source_files || (preserve_hard_links && file->link_u.links)) { SIVAL(numbuf, 0, i); send_msg(MSG_SUCCESS, numbuf, 4); diff --git a/rsync.yo b/rsync.yo index 2d0fb5d5..84735898 100644 --- a/rsync.yo +++ b/rsync.yo @@ -339,7 +339,7 @@ to the detailed description below for a complete description. verb( --rsync-path=PROGRAM specify the rsync to run on remote machine --existing skip creating new files on receiver --ignore-existing skip updating files that exist on receiver - --remove-sender-files sender removes synchronized files (non-dir) + --remove-source-files sender removes synchronized files (non-dir) --del an alias for --delete-during --delete delete extraneous files from dest dirs --delete-before receiver deletes before transfer (default) @@ -918,7 +918,7 @@ dit(bf(--ignore-existing)) This tells rsync to skip updating files that already exist on the destination (this does em(not) ignore existing directores, or nothing would get done). See also bf(--existing). -dit(bf(--remove-sender-files)) This tells rsync to remove from the sending +dit(bf(--remove-source-files)) This tells rsync to remove from the sending side the files (meaning non-directories) that are a part of the transfer and have been successfully duplicated on the receiving side. diff --git a/sender.c b/sender.c index 4afdf5f4..907e6f0b 100644 --- a/sender.c +++ b/sender.c @@ -34,7 +34,7 @@ extern int append_mode; extern int io_error; extern int allowed_lull; extern int protocol_version; -extern int remove_sender_files; +extern int remove_source_files; extern int updating_basis_file; extern int make_backups; extern int do_progress; @@ -134,7 +134,7 @@ void successful_send(int ndx) } else offset = 0; f_name(file, fname + offset); - if (remove_sender_files && do_unlink(fname) == 0 && verbose > 1) + if (remove_source_files && do_unlink(fname) == 0 && verbose > 1) rprintf(FINFO, "sender removed %s\n", fname + offset); } -- 2.34.1