From 4f9b6a01212b4d478cb5463fe9bb8b935ffbbff7 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Tue, 25 Jan 2005 12:18:25 +0000 Subject: [PATCH] substitute exclude -> filter, as appropriate. --- ODBC-dblog.diff | 8 ++++---- backup-dir-dels.diff | 16 ++++++++-------- chmod-option.diff | 4 ++-- delay-renames.diff | 2 +- fname-convert.diff | 4 ++-- fsync.diff | 4 ++-- ignore-case.diff | 4 ++-- openssl-support.diff | 2 +- remove-sent-files.diff | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff index 2c89be5..8f2d019 100644 --- a/ODBC-dblog.diff +++ b/ODBC-dblog.diff @@ -115,10 +115,10 @@ This patch adds the following options: if (verbose > 2) { rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n", ---- orig/clientserver.c 2005-01-25 00:53:58 +--- orig/clientserver.c 2005-01-25 12:14:14 +++ clientserver.c 2004-07-03 20:22:18 @@ -341,6 +341,9 @@ static int rsync_module(int f_in, int f_ - XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE); + XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE); log_init(); +#ifdef HAVE_LIBODBC @@ -697,7 +697,7 @@ This patch adds the following options: { int i; for (i = 0; rerr_names[i].name; i++) { ---- orig/main.c 2005-01-24 01:43:10 +--- orig/main.c 2005-01-25 12:14:14 +++ main.c 2004-07-03 20:22:18 @@ -139,6 +139,9 @@ static void report(int f) @@ -709,7 +709,7 @@ This patch adds the following options: if (f == -1 || !am_sender) return; } ---- orig/receiver.c 2005-01-24 01:43:10 +--- orig/receiver.c 2005-01-25 12:14:14 +++ receiver.c 2004-07-20 21:47:47 @@ -490,6 +490,9 @@ int recv_files(int f_in, struct file_lis fname, fd2, file->length); diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff index 02f92e6..0c17fec 100644 --- a/backup-dir-dels.diff +++ b/backup-dir-dels.diff @@ -14,7 +14,7 @@ suffix. Marc St-Onge ---- orig/backup.c 2005-01-19 20:11:10 +--- orig/backup.c 2005-01-25 12:14:14 +++ backup.c 2004-09-22 02:36:06 @@ -22,11 +22,17 @@ @@ -83,7 +83,7 @@ Marc St-Onge char *p = end; @@ -168,7 +194,8 @@ static int keep_backup(char *fname) - if (!(file = make_file(fname, NULL, NO_EXCLUDES))) + if (!(file = make_file(fname, NULL, NO_FILTERS))) return 1; /* the file could have disappeared */ - if (!(buf = get_backup_name(fname))) @@ -106,7 +106,7 @@ Marc St-Onge + deleting = 0; + return ret; +} ---- orig/flist.c 2005-01-25 00:53:58 +--- orig/flist.c 2005-01-25 12:14:14 +++ flist.c 2005-01-24 02:21:33 @@ -47,6 +47,8 @@ extern char curr_dir[MAXPATHLEN]; extern unsigned int curr_dir_len; @@ -125,7 +125,7 @@ Marc St-Onge extern int copy_links; extern int copy_unsafe_links; extern int protocol_version; -@@ -1661,10 +1664,14 @@ char *f_name(struct file_struct *f) +@@ -1659,10 +1662,14 @@ char *f_name(struct file_struct *f) return f_name_to(f, names[n]); } @@ -141,7 +141,7 @@ Marc St-Onge } void delete_in_dir(struct file_list *flist, char *fname) -@@ -1718,11 +1725,12 @@ void delete_in_dir(struct file_list *fli +@@ -1716,11 +1723,12 @@ void delete_in_dir(struct file_list *fli || (delete_during && S_ISDIR(mode) && !S_ISDIR(flist->files[j]->mode))) { char *f = f_name(del_flist->files[i]); @@ -157,7 +157,7 @@ Marc St-Onge safe_fname(f)); } } else { ---- orig/options.c 2005-01-25 03:26:51 +--- orig/options.c 2005-01-25 12:14:14 +++ options.c 2004-11-27 18:37:18 @@ -119,10 +119,14 @@ int no_detach = 0; int write_batch = 0; @@ -220,7 +220,7 @@ Marc St-Onge files_from = sanitize_path(NULL, files_from, NULL, 0); } @@ -944,6 +956,12 @@ int parse_arguments(int *argc, const cha - if (check_exclude(elp, backup_dir, 1) < 0) + if (check_filter(elp, backup_dir, 1) < 0) goto options_rejected; } + /* Clean delete_dir same as for backup_dir */ @@ -230,7 +230,7 @@ Marc St-Onge + goto options_rejected; + } } - if (server_exclude_list.head && files_from) { + if (server_filter_list.head && files_from) { clean_fname(files_from, 1); @@ -964,6 +982,16 @@ int parse_arguments(int *argc, const cha backup_suffix); diff --git a/chmod-option.diff b/chmod-option.diff index c87c553..c7645b6 100644 --- a/chmod-option.diff +++ b/chmod-option.diff @@ -210,8 +210,8 @@ command before "make": +extern struct chmod_mode_struct *chmod_modes; + - extern struct exclude_list_struct exclude_list; - extern struct exclude_list_struct server_exclude_list; + extern struct filter_list_struct filter_list; + extern struct filter_list_struct server_filter_list; @@ -890,7 +892,10 @@ skip_excludes: file->flags = flags; diff --git a/delay-renames.diff b/delay-renames.diff index 582a7d8..21dc8ef 100644 --- a/delay-renames.diff +++ b/delay-renames.diff @@ -60,7 +60,7 @@ Delay the renaming of all the temp files until the end of the transfer. extern int inplace; +extern int delay_renames; - extern struct exclude_list_struct server_exclude_list; + extern struct filter_list_struct server_filter_list; @@ -272,6 +273,7 @@ int recv_files(int f_in, struct file_lis char fnametmp[MAXPATHLEN]; diff --git a/fname-convert.diff b/fname-convert.diff index 9747b1f..1fe511c 100644 --- a/fname-convert.diff +++ b/fname-convert.diff @@ -95,8 +95,8 @@ Note that you'll need to run 'make proto' after applying this patch. extern int list_only; +extern char *fname_convert_cmd; - extern struct exclude_list_struct exclude_list; - extern struct exclude_list_struct server_exclude_list; + extern struct filter_list_struct filter_list; + extern struct filter_list_struct server_filter_list; @@ -358,7 +359,10 @@ void send_file_entry(struct file_struct io_write_phase = "send_file_entry"; diff --git a/fsync.diff b/fsync.diff index 27bc773..ef06810 100644 --- a/fsync.diff +++ b/fsync.diff @@ -68,14 +68,14 @@ to be called on every file we write. int module_id = -1; +int do_fsync; char *partial_dir; - struct exclude_list_struct server_exclude_list; + struct filter_list_struct server_filter_list; --- orig/util.c 2005-01-20 23:05:34 +++ util.c 2004-07-03 20:18:13 @@ -33,6 +33,7 @@ extern int module_id; extern int modify_window; extern char *partial_dir; - extern struct exclude_list_struct server_exclude_list; + extern struct filter_list_struct server_filter_list; +extern int do_fsync; int sanitize_paths = 0; diff --git a/ignore-case.diff b/ignore-case.diff index 68ae779..44603c5 100644 --- a/ignore-case.diff +++ b/ignore-case.diff @@ -79,7 +79,7 @@ in a case-insensitive manner. int module_id = -1; +int ignore_case = 0; char *partial_dir; - struct exclude_list_struct server_exclude_list; + struct filter_list_struct server_filter_list; --- orig/util.c 2004-09-07 21:45:30 +++ util.c 2004-08-13 16:40:34 @@ -89,7 +89,7 @@ in a case-insensitive manner. extern int modify_window; +extern int ignore_case; extern char *partial_dir; - extern struct exclude_list_struct server_exclude_list; + extern struct filter_list_struct server_filter_list; @@ -1015,11 +1016,23 @@ int u_strcmp(const char *cs1, const char { diff --git a/openssl-support.diff b/openssl-support.diff index ffaa795..2127ad7 100644 --- a/openssl-support.diff +++ b/openssl-support.diff @@ -82,7 +82,7 @@ can't say if I've left any cleanup/compatibility errors in the code. +extern int use_ssl; +#endif extern char *bind_address; - extern struct exclude_list_struct server_exclude_list; + extern struct filter_list_struct server_filter_list; extern char *config_file; @@ -100,8 +103,18 @@ int start_socket_client(char *host, char exit_cleanup(RERR_SOCKETIO); diff --git a/remove-sent-files.diff b/remove-sent-files.diff index 6255f92..ffdecd6 100644 --- a/remove-sent-files.diff +++ b/remove-sent-files.diff @@ -55,7 +55,7 @@ command before "make": + if (need_messages_from_generator) + io_start_multiplex_in(); - recv_exclude_list(f_in); + recv_filter_list(f_in); if (cvs_exclude) @@ -731,6 +734,9 @@ int client_run(int f_in, int f_out, pid_ exit_cleanup(status); -- 2.34.1