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 18 Jun 2004 17:25:38 -0000
+
+--- orig/Makefile.in 2004-11-02 16:47:15
++++ 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 18 Jun 2004 17:25:38 -0000
-@@ -24,6 +24,7 @@
- extern int io_error;
+--- orig/cleanup.c 2005-03-05 18:58:38
++++ 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);
+@@ -125,6 +126,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 18 Jun 2004 17:25:38 -0000
-@@ -34,6 +34,7 @@
+ if (code)
+--- orig/errcode.h 2005-03-16 02:19:29.823770469
++++ errcode.h 2004-07-02 21:38:59
+@@ -35,6 +35,7 @@
#define RERR_STREAMIO 12 /* error in rsync protocol data stream */
#define RERR_MESSAGEIO 13 /* errors with program diagnostics */
#define RERR_IPC 14 /* error in IPC code */
#define RERR_SIGNAL 20 /* status returned when sent SIGUSR1, SIGINT */
#define RERR_WAITCHILD 21 /* some error returned by waitpid() */
---- flist.c 18 Jun 2004 16:29:21 -0000 1.231
-+++ flist.c 18 Jun 2004 17:25:38 -0000
-@@ -43,6 +43,7 @@ extern int cvs_exclude;
-
- extern int recurse;
- extern char curr_dir[MAXPATHLEN];
+--- orig/flist.c 2005-03-16 02:19:29.897764030
++++ flist.c 2005-03-05 00:29:08
+@@ -57,6 +57,7 @@ extern int copy_unsafe_links;
+ extern int protocol_version;
+ extern int sanitize_paths;
+ extern int orig_umask;
+extern char *fname_convert_cmd;
- extern char *files_from;
- extern int filesfrom_fd;
+ extern struct stats stats;
+ extern struct file_list *the_file_list;
-@@ -360,7 +361,10 @@ void send_file_entry(struct file_struct
+@@ -338,7 +339,10 @@ void send_file_entry(struct file_struct
io_write_phase = "send_file_entry";
flags = base_flags;
-@@ -573,6 +577,9 @@ void receive_file_entry(struct file_stru
+@@ -554,6 +558,9 @@ static struct file_struct *receive_file_
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)
-@@ -1061,6 +1068,9 @@ struct file_list *send_file_list(int f,
-
+@@ -1081,6 +1088,9 @@ struct file_list *send_file_list(int f,
start_write = stats.total_written;
+ gettimeofday(&start_tv, NULL);
+ if (!am_server)
+ init_fname_convert();
+
- flist = flist_new(f == -1 ? WITHOUT_HLINK : WITH_HLINK,
- "send_file_list");
+ flist = flist_new(WITH_HLINK, "send_file_list");
-@@ -1235,6 +1245,9 @@ struct file_list *send_file_list(int f,
- write_batch_flist_info(flist->count, flist->files);
- }
+ io_start_buffering_out();
+@@ -1265,6 +1275,9 @@ struct file_list *send_file_list(int f,
+ stats.flist_size = stats.total_written - start_write;
+ stats.num_files = flist->count;
+ if (fname_convert_cmd && !am_server)
+ cleanup_fname_convert();
if (verbose > 3)
output_flist(flist);
-@@ -1256,6 +1269,9 @@ struct file_list *recv_file_list(int f)
+@@ -1286,6 +1299,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;
-@@ -1310,6 +1326,9 @@ struct file_list *recv_file_list(int f)
- }
+@@ -1338,6 +1354,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 18 Jun 2004 17:25:38 -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 Jun 2004 16:30:24 -0000 1.88
-+++ generator.c 18 Jun 2004 17:25:38 -0000
-@@ -268,6 +268,12 @@ static void generate_and_send_sums(struc
+--- orig/generator.c 2005-03-16 02:19:29.980756807
++++ generator.c 2005-03-05 00:29:37
+@@ -581,7 +581,13 @@ static int phase = 0;
+ * start sending checksums.
*
- * @note This comment was added later by mbp who was trying to work it
- * out. It might be wrong.
+ * Note that f_out is set to -1 when doing final directory-permission and
+- * modification-time repair. */
++ * modification-time repair.
+ *
+ * TODO: The filename seen in recv_generator is after filename
+ * conversion. In verbose mode, directories, symlinks and device
+ * 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 7 Jun 2004 22:51:14 -0000 1.74
-+++ log.c 18 Jun 2004 17:25:39 -0000
-@@ -57,6 +57,7 @@ struct {
++ * reporting to the sender. */
+ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+ int itemizing, int maybe_PERMS_REPORT,
+ enum logcode code, int f_out)
+--- orig/log.c 2005-03-16 02:19:30.009754284
++++ log.c 2004-07-03 20:18:02
+@@ -64,6 +64,7 @@ struct {
{ RERR_STREAMIO , "error in rsync protocol data stream" },
{ RERR_MESSAGEIO , "errors with program diagnostics" },
{ RERR_IPC , "error in IPC code" },
{ RERR_SIGNAL , "received SIGUSR1 or SIGINT" },
{ RERR_WAITCHILD , "some error returned by waitpid()" },
{ RERR_MALLOC , "error allocating core memory buffers" },
---- main.c 18 Jun 2004 16:50:20 -0000 1.198
-+++ main.c 18 Jun 2004 17:25:39 -0000
-@@ -219,7 +219,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;
-@@ -234,8 +234,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 */
-@@ -298,7 +303,7 @@ static pid_t do_cmd(char *cmd, char *mac
- create_flist_from_batch(); /* sets batch_flist */
+--- orig/main.c 2005-03-16 02:19:30.077748367
++++ main.c 2004-07-22 00:31:47
+@@ -363,7 +363,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 7 Jun 2004 22:05:22 -0000 1.156
-+++ options.c 18 Jun 2004 17:25:39 -0000
-@@ -127,6 +127,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-03-16 02:19:30.152741841
++++ options.c 2005-02-14 02:50:32
+@@ -137,6 +137,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;
-@@ -271,6 +272,7 @@ void usage(enum logcode F)
+ char *password_file = NULL;
+ char *rsync_path = RSYNC_PATH;
+ char *backup_dir = NULL;
+@@ -320,6 +321,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," --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," --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");
-@@ -368,6 +370,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 },
+ 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");
+@@ -429,6 +431,7 @@ static struct poptOption long_options[]
+ {"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_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 },
+ {"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 18 Jun 2004 16:00:33 -0000 1.8
-+++ pipe.c 18 Jun 2004 17:25:39 -0000
+ {"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 },
+--- orig/pipe.c 2005-02-07 20:36:43
++++ 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
if (pid == -1) {
rsyserr(FERROR, errno, "fork");
exit_cleanup(RERR_IPC);
---- syscall.c 18 Feb 2004 22:33:21 -0000 1.30
-+++ syscall.c 18 Jun 2004 17:25:39 -0000
-@@ -231,3 +231,34 @@ char *d_name(struct dirent *di)
+--- orig/syscall.c 2005-02-14 00:58:10
++++ syscall.c 2004-07-02 21:39:00
+@@ -259,3 +259,34 @@ char *d_name(struct dirent *di)
return di->d_name;
#endif
}
+
+ return result;
+}
---- util.c 9 Jun 2004 21:51:07 -0000 1.149
-+++ util.c 18 Jun 2004 17:25:40 -0000
-@@ -1153,3 +1153,52 @@ void *_realloc_array(void *ptr, unsigned
- return malloc(size * num);
- return realloc(ptr, size * num);
+--- orig/util.c 2005-03-11 17:36:35
++++ util.c 2004-07-03 20:18:02
+@@ -1328,3 +1328,55 @@ uint32 fuzzy_distance(const char *s1, in
+
+ return a[len2-1];
}
+
+/**
+ 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