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 28 Jun 2004 21:08:38 -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 \
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 28 Jun 2004 21:08:38 -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 28 Jun 2004 21:08:38 -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 18 Jun 2004 16:29:21 -0000 1.231
-+++ flist.c 28 Jun 2004 21:08:38 -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];
extern char *files_from;
extern int filesfrom_fd;
-@@ -360,7 +361,10 @@ void send_file_entry(struct file_struct
+@@ -359,7 +360,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
+@@ -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)
-@@ -1061,6 +1068,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;
flist = flist_new(f == -1 ? WITHOUT_HLINK : 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);
+@@ -1256,6 +1266,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);
-@@ -1256,6 +1269,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;
+ init_fname_convert();
+
flist = flist_new(WITH_HLINK, "recv_file_list");
+ received_flist = flist;
- flist->count = 0;
-@@ -1310,6 +1326,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)
if (verbose > 3)
output_flist(flist);
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ fnameconv.c 28 Jun 2004 21:08: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 23 Jun 2004 21:21:19 -0000 1.90
-+++ generator.c 28 Jun 2004 21:08:39 -0000
-@@ -265,6 +265,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.
+ * 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 28 Jun 2004 21:08:39 -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" },
{ RERR_SIGNAL , "received SIGUSR1 or SIGINT" },
{ RERR_WAITCHILD , "some error returned by waitpid()" },
{ RERR_MALLOC , "error allocating core memory buffers" },
---- main.c 28 Jun 2004 17:45:40 -0000 1.201
-+++ main.c 28 Jun 2004 21:08:39 -0000
-@@ -304,7 +304,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)
---- options.c 20 Jun 2004 19:47:05 -0000 1.157
-+++ options.c 28 Jun 2004 21:08:39 -0000
-@@ -127,6 +127,7 @@ char *backup_dir = NULL;
- char backup_dir_buf[MAXPATHLEN];
- int rsync_port = RSYNC_PORT;
- int link_dest = 0;
+ 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;
-@@ -271,6 +272,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");
-@@ -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 },
+@@ -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 18 Jun 2004 16:00:33 -0000 1.8
-+++ pipe.c 28 Jun 2004 21:08:39 -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
if (pid == -1) {
rsyserr(FERROR, errno, "fork");
exit_cleanup(RERR_IPC);
---- syscall.c 18 Feb 2004 22:33:21 -0000 1.30
-+++ syscall.c 28 Jun 2004 21:08:39 -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
}
+
+ return result;
+}
---- util.c 9 Jun 2004 21:51:07 -0000 1.149
-+++ util.c 28 Jun 2004 21:08:40 -0000
-@@ -1153,3 +1153,55 @@ 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);
}