X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/a6587818c397ffbdfc336e77d5021efb103debf9..b4023df5de0cc716eb2f3415b1df0cb08ed21430:/fname-convert.diff diff --git a/fname-convert.diff b/fname-convert.diff index 838c671..3c91a03 100644 --- a/fname-convert.diff +++ b/fname-convert.diff @@ -47,7 +47,7 @@ some utility functions. Note that you'll need to run 'make proto' after applying this patch. ---- orig/Makefile.in 2004-08-13 07:18:58 +--- orig/Makefile.in 2004-11-03 11:56:03 +++ Makefile.in 2004-07-03 20:18:02 @@ -35,7 +35,7 @@ OBJS1=rsync.o generator.o receiver.o cle main.o checksum.o match.o syscall.o log.o backup.o @@ -58,18 +58,18 @@ Note that you'll need to run 'make proto' after applying this patch. DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ popt/popthelp.o popt/poptparse.o ---- orig/cleanup.c 2004-07-29 16:08:03 -+++ cleanup.c 2004-07-03 20:18:02 -@@ -24,6 +24,7 @@ - extern int io_error; +--- orig/cleanup.c 2005-01-10 09:46:11 ++++ cleanup.c 2005-01-10 10:40:51 +@@ -25,6 +25,7 @@ extern int io_error; extern int keep_partial; extern int log_got_error; + extern char *partial_dir; +extern char *fname_convert_cmd; /** * Close all open sockets and files, allowing a (somewhat) graceful -@@ -122,6 +123,8 @@ void _exit_cleanup(int code, const char - finish_transfer(cleanup_new_fname, fname, cleanup_file, 0); +@@ -126,6 +127,8 @@ void _exit_cleanup(int code, const char + !partial_dir); } io_flush(FULL_FLUSH); + if (fname_convert_cmd) @@ -87,7 +87,7 @@ 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 2004-09-21 09:40:27 +--- orig/flist.c 2005-01-01 21:11:00 +++ flist.c 2004-08-12 18:35:53 @@ -44,6 +44,7 @@ extern int cvs_exclude; @@ -119,7 +119,7 @@ Note that you'll need to run 'make proto' after applying this patch. clean_fname(thisname, 0); if (sanitize_paths) -@@ -1079,6 +1086,9 @@ struct file_list *send_file_list(int f, +@@ -1084,6 +1091,9 @@ struct file_list *send_file_list(int f, start_write = stats.total_written; @@ -129,7 +129,7 @@ Note that you'll need to run 'make proto' after applying this patch. flist = flist_new(f == -1 ? WITHOUT_HLINK : WITH_HLINK, "send_file_list"); -@@ -1251,6 +1261,9 @@ struct file_list *send_file_list(int f, +@@ -1256,6 +1266,9 @@ struct file_list *send_file_list(int f, 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); -@@ -1272,6 +1285,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; -@@ -1325,6 +1341,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 2004-09-20 19:50:13 +--- orig/generator.c 2005-01-15 21:18:09 +++ generator.c 2004-07-03 20:18:02 -@@ -252,6 +252,12 @@ static void generate_and_send_sums(int f +@@ -247,6 +247,12 @@ static void generate_and_send_sums(int f * * @note This comment was added later by mbp who was trying to work it * out. It might be wrong. @@ -396,7 +396,7 @@ Note that you'll need to run 'make proto' after applying this patch. + * reporting to the sender. */ static void recv_generator(char *fname, struct file_struct *file, int i, - int f_out) + int f_out, int f_out_name) --- orig/log.c 2004-09-07 19:54:51 +++ log.c 2004-07-03 20:18:02 @@ -57,6 +57,7 @@ struct { @@ -407,9 +407,9 @@ Note that you'll need to run 'make proto' after applying this patch. { RERR_SIGNAL , "received SIGUSR1 or SIGINT" }, { RERR_WAITCHILD , "some error returned by waitpid()" }, { RERR_MALLOC , "error allocating core memory buffers" }, ---- orig/main.c 2004-09-18 01:49:33 +--- orig/main.c 2005-01-14 18:30:18 +++ main.c 2004-07-22 00:31:47 -@@ -332,7 +332,7 @@ static pid_t do_cmd(char *cmd, char *mac +@@ -334,7 +334,7 @@ static pid_t do_cmd(char *cmd, char *mac whole_file = 1; ret = local_child(argc, args, f_in, f_out, child_main); } else @@ -418,32 +418,32 @@ Note that you'll need to run 'make proto' after applying this patch. if (dir) free(dir); ---- orig/options.c 2004-09-20 05:10:48 -+++ options.c 2004-07-03 20:18:02 -@@ -129,6 +129,7 @@ char *backup_dir = NULL; - char backup_dir_buf[MAXPATHLEN]; - int rsync_port = RSYNC_PORT; - int link_dest = 0; +--- orig/options.c 2005-01-15 21:23:15 ++++ options.c 2005-01-15 21:28:07 +@@ -125,6 +125,7 @@ char *basis_dir[MAX_BASIS_DIRS+1]; + char *config_file = NULL; + char *shell_cmd = NULL; + char *log_format = NULL; +char *fname_convert_cmd = NULL; - - int verbose = 0; - int quiet = 0; -@@ -280,6 +281,7 @@ void usage(enum logcode F) - rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n"); - rprintf(F," --link-dest=DIR create hardlinks to DIR for unchanged files\n"); + char *password_file = NULL; + char *rsync_path = RSYNC_PATH; + char *backup_dir = NULL; +@@ -289,6 +290,7 @@ void usage(enum logcode F) + rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n"); + rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n"); rprintf(F," -P equivalent to --partial --progress\n"); + rprintf(F," --fname-convert=CMD invoke CMD for filename conversion\n"); rprintf(F," -z, --compress compress file data\n"); rprintf(F," -C, --cvs-exclude auto ignore files in the same way CVS does\n"); rprintf(F," --exclude=PATTERN exclude files matching PATTERN\n"); -@@ -378,6 +380,7 @@ static struct poptOption long_options[] - {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 }, - {"compare-dest", 0, POPT_ARG_STRING, &compare_dest, 0, 0, 0 }, - {"link-dest", 0, POPT_ARG_STRING, &compare_dest, OPT_LINK_DEST, 0, 0 }, +@@ -384,6 +386,7 @@ static struct poptOption long_options[] + {"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 }, + {"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 }, + {"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 }, + {"fname-convert", 0, POPT_ARG_STRING, &fname_convert_cmd, 0, 0, 0 }, /* TODO: Should this take an optional int giving the compression level? */ {"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 }, - {"daemon", 0, POPT_ARG_NONE, &daemon_opt, 0, 0, 0 }, + {"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 }, --- orig/pipe.c 2004-08-12 18:34:38 +++ pipe.c 2004-07-03 20:18:02 @@ -23,7 +23,6 @@ @@ -475,9 +475,9 @@ Note that you'll need to run 'make proto' after applying this patch. if (pid == -1) { rsyserr(FERROR, errno, "fork"); exit_cleanup(RERR_IPC); ---- orig/syscall.c 2004-08-02 21:56:59 +--- orig/syscall.c 2005-01-10 00:21:12 +++ syscall.c 2004-07-02 21:39:00 -@@ -231,3 +231,34 @@ char *d_name(struct dirent *di) +@@ -268,3 +268,34 @@ char *d_name(struct dirent *di) return di->d_name; #endif }