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-07-04 08:59:17
++++ 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 \
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
+--- orig/cleanup.c 2004-07-02 18:11:26
++++ cleanup.c 2004-07-03 20:18:02
@@ -24,6 +24,7 @@
extern int io_error;
extern int keep_partial;
/**
* Close all open sockets and files, allowing a (somewhat) graceful
-@@ -121,6 +122,8 @@ void _exit_cleanup(int code, const char
+@@ -124,6 +125,8 @@ void _exit_cleanup(int code, const char
finish_transfer(cleanup_new_fname, fname, cleanup_file, 0);
}
io_flush(FULL_FLUSH);
+ 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 */
#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
+--- orig/flist.c 2004-07-15 02:21:10
++++ flist.c 2004-07-03 20:18:02
@@ -43,6 +43,7 @@ extern int cvs_exclude;
extern int recurse;
extern char *files_from;
extern int filesfrom_fd;
-@@ -346,7 +347,11 @@ void send_file_entry(struct file_struct
+@@ -357,7 +358,10 @@ void send_file_entry(struct file_struct
io_write_phase = "send_file_entry";
+ 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
+@@ -570,6 +574,9 @@ void receive_file_entry(struct file_stru
strlcpy(lastname, thisname, MAXPATHLEN);
clean_fname(thisname);
if (sanitize_paths)
-@@ -1041,6 +1049,9 @@ struct file_list *send_file_list(int f,
+@@ -1055,6 +1062,9 @@ struct file_list *send_file_list(int f,
start_write = stats.total_written;
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);
+@@ -1227,6 +1237,9 @@ struct file_list *send_file_list(int f,
+ stats.num_files = flist->count;
}
+ if (fname_convert_cmd && !am_server)
if (verbose > 3)
output_flist(flist);
-@@ -1237,6 +1251,9 @@ struct file_list *recv_file_list(int f)
+@@ -1248,6 +1261,9 @@ struct file_list *recv_file_list(int f)
start_read = stats.total_read;
flist = flist_new(WITH_HLINK, "recv_file_list");
flist->count = 0;
-@@ -1291,6 +1308,9 @@ struct file_list *recv_file_list(int f)
- }
+@@ -1300,6 +1316,9 @@ struct file_list *recv_file_list(int f)
+ io_error |= read_int(f);
}
+ if (fname_convert_cmd && !am_server)
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" -*-
+ *
+ 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 2004-07-16 19:35:29
++++ generator.c 2004-07-03 20:18:02
+@@ -249,6 +249,12 @@ static void generate_and_send_sums(struc
*
* @note This comment was added later by mbp who was trying to work it
* out. It might be wrong.
+ * 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)
+--- orig/log.c 2004-06-09 15:34:38
++++ 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" },
{ 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 2004-07-15 17:02:03
++++ main.c 2004-07-03 20:18:02
+@@ -318,7 +318,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 {
- 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;
+ if (dir)
+--- orig/options.c 2004-07-16 20:07:22
++++ options.c 2004-07-03 20:18:02
+@@ -128,6 +128,7 @@ char *backup_dir = NULL;
char backup_dir_buf[MAXPATHLEN];
int rsync_port = RSYNC_PORT;
int link_dest = 0;
int verbose = 0;
int quiet = 0;
-@@ -268,6 +269,7 @@ void usage(enum logcode F)
+@@ -277,6 +278,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");
rprintf(F," -P equivalent to --partial --progress\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[]
+@@ -375,6 +377,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 },
/* 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
+--- orig/pipe.c 2004-07-15 02:21:11
++++ pipe.c 2004-07-03 20:18:02
@@ -23,7 +23,6 @@
extern int am_sender;
-extern int blocking_io;
extern int orig_umask;
extern int read_batch;
- extern int filesfrom_fd;
-@@ -40,8 +39,10 @@ extern int filesfrom_fd;
+ extern int write_batch;
+@@ -41,8 +40,10 @@ extern int filesfrom_fd;
* If blocking_io is set then use blocking io on both fds. That can be
* used to cope with badly broken rsh implementations like the one on
* Solaris.
pid_t pid;
int to_child_pipe[2];
@@ -57,7 +58,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
+--- orig/syscall.c 2004-02-18 22:33:21
++++ syscall.c 2004-07-02 21:39:00
@@ -231,3 +231,34 @@ char *d_name(struct dirent *di)
return di->d_name;
#endif
+ struct timeval intended, before, after;
+ int result;
+
-+ if (timeout == NULL) {
++ if (timeout == NULL)
+ return select(n, readfds, writefds, exceptfds, timeout);
+
+ intended = *timeout;
+
+ 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-06-09 21:54:47
++++ util.c 2004-07-03 20:18:02
+@@ -1153,3 +1153,55 @@ void *_realloc_array(void *ptr, unsigned
return malloc(size * num);
return realloc(ptr, size * num);
}
+ 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. */
+ }
+}
-+
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff