Note that you'll need to run 'make proto' after applying this patch.
---- orig/Makefile.in 2004-11-03 11:56:03
+--- 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
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 2005-01-28 23:01:07
+--- 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;
if (cleanup_fname)
do_unlink(cleanup_fname);
if (code)
---- orig/errcode.h 2003-12-15 08:04:14
+--- orig/errcode.h 2005-03-16 02:19:29.823770469
+++ errcode.h 2004-07-02 21:38:59
-@@ -34,6 +34,7 @@
+@@ -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() */
---- orig/flist.c 2005-02-03 02:04:20
-+++ flist.c 2005-01-21 19:10:03
-@@ -69,6 +69,7 @@ extern int delete_excluded;
- extern int max_delete;
+--- 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 int list_only;
+extern char *fname_convert_cmd;
+ extern struct stats stats;
+ extern struct file_list *the_file_list;
- extern struct filter_list_struct filter_list;
- extern struct filter_list_struct server_filter_list;
-@@ -348,7 +349,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;
-@@ -564,6 +568,9 @@ static void receive_file_entry(struct fi
+@@ -554,6 +558,9 @@ static struct file_struct *receive_file_
strlcpy(lastname, thisname, MAXPATHLEN);
+ 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");
-@@ -1269,6 +1279,9 @@ struct file_list *send_file_list(int f,
- stats.num_files = flist->count;
- }
+ 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, f < 0 ? "delete" : who_am_i());
+ output_flist(flist);
-@@ -1290,6 +1303,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;
+ init_fname_convert();
+
flist = flist_new(WITH_HLINK, "recv_file_list");
- received_flist = flist;
-@@ -1343,6 +1359,9 @@ struct file_list *recv_file_list(int f)
+ flist->count = 0;
+@@ -1338,6 +1354,9 @@ struct file_list *recv_file_list(int f)
io_error |= read_int(f);
}
+ cleanup_fname_convert();
+
if (verbose > 3)
- output_flist(flist, who_am_i());
+ output_flist(flist);
--- orig/fnameconv.c 2004-07-02 21:38:59
+++ fnameconv.c 2004-07-02 21:38:59
+ if (verbose > 2)
+ rprintf(FINFO, "Converted filename: %s -> %s\n", src, dest);
+}
---- orig/generator.c 2005-02-03 02:04:20
-+++ generator.c 2005-02-03 02:07:33
-@@ -235,7 +235,13 @@ static void generate_and_send_sums(int f
+--- 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 that f_out is set to -1 when doing final directory-permission and
+ * 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. */
- static void recv_generator(char *fname, struct file_list *flist,
- struct file_struct *file, int ndx,
- int f_out, int f_out_name)
---- orig/log.c 2005-02-01 10:39:22
+ 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
-@@ -57,6 +57,7 @@ struct {
+@@ -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" },
---- orig/main.c 2005-01-30 10:07:21
+--- orig/main.c 2005-03-16 02:19:30.077748367
+++ main.c 2004-07-22 00:31:47
-@@ -361,7 +361,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -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
if (dir)
free(dir);
---- orig/options.c 2005-02-01 10:39:22
-+++ options.c 2005-01-28 19:29:38
-@@ -129,6 +129,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
+--- 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 *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
-@@ -303,6 +304,7 @@ void usage(enum logcode F)
+@@ -320,6 +321,7 @@ void usage(enum logcode F)
rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\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," -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");
-@@ -408,6 +410,7 @@ static struct poptOption long_options[]
- {"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
+@@ -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 },
{"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 },
---- orig/pipe.c 2004-08-12 18:34:38
+--- orig/pipe.c 2005-02-07 20:36:43
+++ pipe.c 2004-07-03 20:18:02
@@ -23,7 +23,6 @@
if (pid == -1) {
rsyserr(FERROR, errno, "fork");
exit_cleanup(RERR_IPC);
---- orig/syscall.c 2005-01-28 23:01:10
+--- 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;
+
+ return result;
+}
---- orig/util.c 2005-01-28 19:08:20
+--- orig/util.c 2005-03-11 17:36:35
+++ util.c 2004-07-03 20:18:02
-@@ -1213,3 +1213,55 @@ void *_realloc_array(void *ptr, unsigned
- return malloc(size * num);
- return realloc(ptr, size * num);
+@@ -1328,3 +1328,55 @@ uint32 fuzzy_distance(const char *s1, in
+
+ return a[len2-1];
}
+
+/**
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff