X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/4a751edb65f6011cb12187e32b07a81e03315b77..0f6260347bf6c29859ed4808f04222f84c2a8817:/fname-convert.diff diff --git a/fname-convert.diff b/fname-convert.diff index 0bfe920..3c91a03 100644 --- a/fname-convert.diff +++ b/fname-convert.diff @@ -42,13 +42,13 @@ like a minor concern. Most of the new code is in the new file fnameconv.c. The patch lightly touches some other files, mostly flist.c and the addition/extension of -some utility functions. I took the opportunity to fix an argument -parsing buffer overflow bug in main.c. Note that you'll need to run -autoconf and 'make proto'. +some utility functions. +Note that you'll need to run 'make proto' after applying this patch. ---- Makefile.in 15 May 2004 00:48:11 -0000 1.101 -+++ Makefile.in 29 May 2004 21:31:45 -0000 + +--- 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 OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \ @@ -58,27 +58,27 @@ autoconf and 'make proto'. 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 ---- cleanup.c 13 May 2004 07:08:18 -0000 1.22 -+++ cleanup.c 29 May 2004 21:31:45 -0000 -@@ -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 -@@ -121,6 +122,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) + cleanup_fname_convert(); if (cleanup_fname) do_unlink(cleanup_fname); - if (code) { ---- errcode.h 15 Dec 2003 08:04:14 -0000 1.8 -+++ errcode.h 29 May 2004 21:31:45 -0000 + if (code) +--- orig/errcode.h 2003-12-15 08:04:14 ++++ errcode.h 2004-07-02 21:38:59 @@ -34,6 +34,7 @@ #define RERR_STREAMIO 12 /* error in rsync protocol data stream */ #define RERR_MESSAGEIO 13 /* errors with program diagnostics */ @@ -87,9 +87,9 @@ autoconf and 'make proto'. #define RERR_SIGNAL 20 /* status returned when sent SIGUSR1, SIGINT */ #define RERR_WAITCHILD 21 /* some error returned by waitpid() */ ---- flist.c 29 May 2004 21:21:17 -0000 1.226 -+++ flist.c 29 May 2004 21:31:46 -0000 -@@ -43,6 +43,7 @@ extern int cvs_exclude; +--- 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; extern int recurse; extern char curr_dir[MAXPATHLEN]; @@ -97,7 +97,7 @@ autoconf and 'make proto'. extern char *files_from; extern int filesfrom_fd; -@@ -346,7 +347,11 @@ void send_file_entry(struct file_struct +@@ -359,7 +360,10 @@ void send_file_entry(struct file_struct io_write_phase = "send_file_entry"; @@ -106,21 +106,20 @@ autoconf and 'make proto'. + convert_fname(fname, f_name(file), MAXPATHLEN); + else + f_name_to(file, fname); -+ flags = base_flags; -@@ -559,6 +564,9 @@ void receive_file_entry(struct file_stru +@@ -572,6 +576,9 @@ void receive_file_entry(struct file_stru strlcpy(lastname, thisname, MAXPATHLEN); + if (fname_convert_cmd && !am_server) /* fname conversion always done on client */ + convert_fname(thisname, lastname, MAXPATHLEN); + - clean_fname(thisname); + clean_fname(thisname, 0); if (sanitize_paths) -@@ -1041,6 +1049,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; @@ -130,8 +129,8 @@ autoconf and 'make proto'. flist = flist_new(f == -1 ? WITHOUT_HLINK : WITH_HLINK, "send_file_list"); -@@ -1215,6 +1226,9 @@ struct file_list *send_file_list(int f, - write_batch_flist_info(flist->count, flist->files); +@@ -1256,6 +1266,9 @@ struct file_list *send_file_list(int f, + stats.num_files = flist->count; } + if (fname_convert_cmd && !am_server) @@ -140,7 +139,7 @@ autoconf and 'make proto'. if (verbose > 3) output_flist(flist); -@@ -1237,6 +1251,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; @@ -148,10 +147,10 @@ autoconf and 'make proto'. + init_fname_convert(); + flist = flist_new(WITH_HLINK, "recv_file_list"); + received_flist = flist; - flist->count = 0; -@@ -1291,6 +1308,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); } + if (fname_convert_cmd && !am_server) @@ -160,8 +159,8 @@ autoconf and 'make proto'. if (verbose > 3) output_flist(flist); ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ fnameconv.c 29 May 2004 21:31:46 -0000 +--- orig/fnameconv.c 2004-07-02 21:38:59 ++++ fnameconv.c 2004-07-02 21:38:59 @@ -0,0 +1,220 @@ +/* -*- c-file-style: "linux" -*- + * @@ -383,9 +382,9 @@ autoconf and 'make proto'. + if (verbose > 2) + rprintf(FINFO, "Converted filename: %s -> %s\n", src, dest); +} ---- generator.c 18 May 2004 08:50:17 -0000 1.85 -+++ generator.c 29 May 2004 21:31:46 -0000 -@@ -267,6 +267,12 @@ static void generate_and_send_sums(struc +--- orig/generator.c 2005-01-15 21:18:09 ++++ generator.c 2004-07-03 20:18:02 +@@ -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. @@ -395,11 +394,11 @@ autoconf and 'make proto'. + * files are printf()ed here but regular files are rprintf()ed on the + * sender (unconverted). To solve the above, move all progress + * reporting to the sender. - **/ - void recv_generator(char *fname, struct file_struct *file, int i, int f_out) - { ---- log.c 15 May 2004 19:31:16 -0000 1.73 -+++ log.c 29 May 2004 21:31:47 -0000 + */ + static void recv_generator(char *fname, struct file_struct *file, int i, + 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 { { RERR_STREAMIO , "error in rsync protocol data stream" }, { RERR_MESSAGEIO , "errors with program diagnostics" }, @@ -408,76 +407,52 @@ autoconf and 'make proto'. { RERR_SIGNAL , "received SIGUSR1 or SIGINT" }, { RERR_WAITCHILD , "some error returned by waitpid()" }, { RERR_MALLOC , "error allocating core memory buffers" }, ---- main.c 19 May 2004 22:19:19 -0000 1.195 -+++ main.c 29 May 2004 21:31:47 -0000 -@@ -217,7 +217,7 @@ static pid_t do_cmd(char *cmd, char *mac - int *f_in, int *f_out) - { - int i, argc = 0; -- char *args[100]; -+ char *args[MAX_ARGS]; - pid_t ret; - char *tok, *dir = NULL; - int dash_l_set = 0; -@@ -232,8 +232,13 @@ static pid_t do_cmd(char *cmd, char *mac - if (!cmd) - goto oom; - -- for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " ")) -+ for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " ")) { -+ if (argc >= MAX_ARGS) { -+ rprintf(FERROR, "Command is too long\n"); -+ exit_cleanup(RERR_SYNTAX); -+ } - args[argc++] = tok; -+ } - - /* check to see if we've already been given '-l user' in - * the remote-shell command */ -@@ -296,7 +301,7 @@ static pid_t do_cmd(char *cmd, char *mac - create_flist_from_batch(); /* sets batch_flist */ +--- orig/main.c 2005-01-14 18:30:18 ++++ main.c 2004-07-22 00:31:47 +@@ -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 { + } else - ret = piped_child(args,f_in,f_out); + ret = piped_child(args, f_in, f_out, blocking_io, 1); - } - if (dir) free(dir); ---- options.c 27 May 2004 21:51:53 -0000 1.153 -+++ options.c 29 May 2004 21:31:48 -0000 -@@ -125,6 +125,7 @@ char *backup_dir = NULL; - char backup_dir_buf[MAXPATHLEN]; - int rsync_port = RSYNC_PORT; - int link_dest = 0; + if (dir) + free(dir); +--- 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; -@@ -268,6 +269,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"); -@@ -364,6 +366,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 }, ---- pipe.c 15 May 2004 19:31:10 -0000 1.7 -+++ pipe.c 29 May 2004 21:31:48 -0000 + {"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 @@ extern int am_sender; extern int am_server; -extern int blocking_io; extern int orig_umask; - extern int read_batch; + extern int write_batch; extern int filesfrom_fd; @@ -40,8 +39,10 @@ extern int filesfrom_fd; * If blocking_io is set then use blocking io on both fds. That can be @@ -491,18 +466,18 @@ autoconf and 'make proto'. { pid_t pid; int to_child_pipe[2]; -@@ -57,7 +58,7 @@ pid_t piped_child(char **command, int *f +@@ -56,7 +57,7 @@ pid_t piped_child(char **command, int *f + exit_cleanup(RERR_IPC); } - - pid = do_fork(); + pid = register_child ? do_fork() : fork(); if (pid == -1) { rsyserr(FERROR, errno, "fork"); exit_cleanup(RERR_IPC); ---- syscall.c 18 Feb 2004 22:33:21 -0000 1.30 -+++ syscall.c 29 May 2004 21:31:48 -0000 -@@ -231,3 +231,34 @@ char *d_name(struct dirent *di) +--- orig/syscall.c 2005-01-10 00:21:12 ++++ syscall.c 2004-07-02 21:39:00 +@@ -268,3 +268,34 @@ char *d_name(struct dirent *di) return di->d_name; #endif } @@ -518,7 +493,7 @@ autoconf and 'make proto'. + struct timeval intended, before, after; + int result; + -+ if (timeout == NULL) { ++ if (timeout == NULL) + return select(n, readfds, writefds, exceptfds, timeout); + + intended = *timeout; @@ -537,9 +512,9 @@ autoconf and 'make proto'. + + return result; +} ---- util.c 24 May 2004 22:59:16 -0000 1.147 -+++ util.c 29 May 2004 21:31:48 -0000 -@@ -1135,3 +1135,52 @@ void *_realloc_array(void *ptr, unsigned +--- orig/util.c 2004-09-07 21:45:30 ++++ util.c 2004-07-03 20:18:02 +@@ -1217,3 +1217,55 @@ void *_realloc_array(void *ptr, unsigned return malloc(size * num); return realloc(ptr, size * num); } @@ -558,37 +533,40 @@ autoconf and 'make proto'. + struct timeval tv; + int res; + -+ tv.tv_sec = timeout_ms/1000; -+ tv.tv_usec = (timeout_ms%1000)*1000; ++ tv.tv_sec = timeout_ms / 1000; ++ tv.tv_usec = (timeout_ms % 1000) * 1000; + + while (1) { ++ int maxfd = 0; + FD_ZERO(&read_fds); + FD_ZERO(&write_fds); + FD_ZERO(&except_fds); + if (write_fd >= 0) { + FD_SET(write_fd, &write_fds); + FD_SET(write_fd, &except_fds); ++ if (write_fd > maxfd) ++ maxfd = write_fd; + } + if (read_fd >= 0) { + FD_SET(read_fd, &read_fds); + FD_SET(read_fd, &except_fds); ++ if (read_fd > maxfd) ++ maxfd = read_fd; + } + -+ res = do_select(MAX(0,MAX(read_fd, write_fd)+1), &read_fds, &write_fds, &except_fds, &tv); ++ res = do_select(maxfd+1, &read_fds, &write_fds, &except_fds, &tv); + if (res > 0) + return 1; -+ if (read_fd >= 0 && (FD_ISSET(read_fd, &read_fds) || FD_ISSET(read_fd, &except_fds))) -+ return 1; -+ if (write_fd >= 0 && (FD_ISSET(write_fd, &write_fds) || FD_ISSET(write_fd, &except_fds))) -+ return 1; -+ if (res == EINTR || res == EAGAIN) { -+ continue; /* Retry */ -+ } + if (res < 0) { ++ if (errno == EINTR || errno == EAGAIN) ++ continue; /* Retry */ + rprintf(FERROR, "Error awaiting fname converter: %s\n", strerror(errno)); + exit_cleanup(RERR_FNAMECONV); + } ++ if (read_fd >= 0 && (FD_ISSET(read_fd, &read_fds) || FD_ISSET(read_fd, &except_fds))) ++ return 1; ++ if (write_fd >= 0 && (FD_ISSET(write_fd, &write_fds) || FD_ISSET(write_fd, &except_fds))) ++ return 1; + return 0; /* res == 0 and no FDs set, hence a timeout. */ + } +} -+