X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/19a778eb4cb069758ca47618b2e4c1b8dce52d2c..8ab3ce193fe1b2f46cae80c9dd26c22cb105a14c:/fname-convert.diff diff --git a/fname-convert.diff b/fname-convert.diff index 3807df6..4d7d670 100644 --- a/fname-convert.diff +++ b/fname-convert.diff @@ -87,17 +87,17 @@ Note that you'll need to run 'make proto' after applying this patch. #define RERR_SIGNAL 20 /* status returned when sent SIGUSR1, SIGINT */ #define RERR_WAITCHILD 21 /* some error returned by waitpid() */ ---- orig/flist.c 2005-02-23 02:57:26 -+++ flist.c 2005-02-21 11:04:00 +--- orig/flist.c 2005-02-26 05:22:50 ++++ flist.c 2005-02-26 05:23:26 @@ -63,6 +63,7 @@ extern int force_delete; extern int orig_umask; extern int make_backups; extern unsigned int curr_dir_len; +extern char *fname_convert_cmd; - extern char *log_format; extern char *backup_dir; extern char *backup_suffix; -@@ -346,7 +347,10 @@ void send_file_entry(struct file_struct + extern int backup_suffix_len; +@@ -345,7 +346,10 @@ void send_file_entry(struct file_struct io_write_phase = "send_file_entry"; @@ -109,7 +109,7 @@ Note that you'll need to run 'make proto' after applying this patch. flags = base_flags; -@@ -562,6 +566,9 @@ static struct file_struct *receive_file_ +@@ -561,6 +565,9 @@ static struct file_struct *receive_file_ strlcpy(lastname, thisname, MAXPATHLEN); @@ -119,7 +119,7 @@ Note that you'll need to run 'make proto' after applying this patch. clean_fname(thisname, 0); if (sanitize_paths) -@@ -1075,6 +1082,9 @@ struct file_list *send_file_list(int f, +@@ -1074,6 +1081,9 @@ struct file_list *send_file_list(int f, start_write = stats.total_written; gettimeofday(&start_tv, NULL); @@ -129,7 +129,7 @@ Note that you'll need to run 'make proto' after applying this patch. flist = flist_new(WITH_HLINK, "send_file_list"); io_start_buffering_out(); -@@ -1257,6 +1267,9 @@ struct file_list *send_file_list(int f, +@@ -1256,6 +1266,9 @@ struct file_list *send_file_list(int f, stats.flist_size = stats.total_written - start_write; stats.num_files = flist->count; @@ -139,7 +139,7 @@ Note that you'll need to run 'make proto' after applying this patch. if (verbose > 3) output_flist(flist, who_am_i()); -@@ -1278,6 +1291,9 @@ struct file_list *recv_file_list(int f) +@@ -1277,6 +1290,9 @@ struct file_list *recv_file_list(int f) start_read = stats.total_read; @@ -149,7 +149,7 @@ Note that you'll need to run 'make proto' after applying this patch. flist = flist_new(WITH_HLINK, "recv_file_list"); received_flist = flist; -@@ -1331,6 +1347,9 @@ struct file_list *recv_file_list(int f) +@@ -1330,6 +1346,9 @@ struct file_list *recv_file_list(int f) io_error |= read_int(f); } @@ -382,9 +382,9 @@ Note that you'll need to run 'make proto' after applying this patch. + if (verbose > 2) + rprintf(FINFO, "Converted filename: %s -> %s\n", src, dest); +} ---- orig/generator.c 2005-02-23 02:57:26 +--- orig/generator.c 2005-02-26 03:22:59 +++ generator.c 2005-02-03 02:07:33 -@@ -342,7 +342,13 @@ static int find_fuzzy(struct file_struct +@@ -343,7 +343,13 @@ static int find_fuzzy(struct file_struct * start sending checksums. * * Note that f_out is set to -1 when doing final directory-permission and @@ -399,9 +399,9 @@ Note that you'll need to run 'make proto' after applying this patch. static void recv_generator(char *fname, struct file_list *flist, struct file_struct *file, int ndx, int f_out, int f_out_name) ---- orig/log.c 2005-02-21 07:28:59 +--- orig/log.c 2005-02-26 05:22:50 +++ log.c 2004-07-03 20:18:02 -@@ -62,6 +62,7 @@ struct { +@@ -63,6 +63,7 @@ struct { { RERR_STREAMIO , "error in rsync protocol data stream" }, { RERR_MESSAGEIO , "errors with program diagnostics" }, { RERR_IPC , "error in IPC code" }, @@ -420,9 +420,9 @@ Note that you'll need to run 'make proto' after applying this patch. if (dir) free(dir); ---- orig/options.c 2005-02-23 02:57:26 +--- orig/options.c 2005-02-25 18:44:31 +++ options.c 2005-02-14 02:50:32 -@@ -136,6 +136,7 @@ char *basis_dir[MAX_BASIS_DIRS+1]; +@@ -137,6 +137,7 @@ char *basis_dir[MAX_BASIS_DIRS+1]; char *config_file = NULL; char *shell_cmd = NULL; char *log_format = NULL; @@ -430,7 +430,7 @@ Note that you'll need to run 'make proto' after applying this patch. char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; -@@ -317,6 +318,7 @@ void usage(enum logcode F) +@@ -318,6 +319,7 @@ void usage(enum logcode F) rprintf(F," -y, --fuzzy find similar file for basis if no dest file\n"); rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n"); rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n"); @@ -438,7 +438,7 @@ Note that you'll need to run 'make proto' after applying this patch. rprintf(F," -z, --compress compress file data during the transfer\n"); rprintf(F," -C, --cvs-exclude auto-ignore files the same way CVS does\n"); rprintf(F," -f, --filter=RULE add a file-filtering RULE\n"); -@@ -425,6 +427,7 @@ static struct poptOption long_options[] +@@ -426,6 +428,7 @@ static struct poptOption long_options[] {"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 }, {"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 }, {"fuzzy", 'y', POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 },