#define RERR_SIGNAL 20 /* status returned when sent SIGUSR1, SIGINT */
#define RERR_WAITCHILD 21 /* some error returned by waitpid() */
---- orig/flist.c 2005-02-19 09:27:48
+--- orig/flist.c 2005-02-20 00:16:35
+++ flist.c 2005-02-19 09:31:41
-@@ -68,6 +68,7 @@ extern int max_delete;
- extern int orig_umask;
+@@ -62,6 +62,7 @@ extern int orig_umask;
extern int list_only;
+ extern unsigned int curr_dir_len;
extern char *log_format;
+extern char *fname_convert_cmd;
- extern struct filter_list_struct filter_list;
- extern struct filter_list_struct server_filter_list;
-@@ -346,7 +347,10 @@ void send_file_entry(struct file_struct
+ extern char curr_dir[MAXPATHLEN];
+
+@@ -341,7 +342,10 @@ void send_file_entry(struct file_struct
io_write_phase = "send_file_entry";
flags = base_flags;
-@@ -562,6 +566,9 @@ static struct file_struct *receive_file_
+@@ -557,6 +561,9 @@ static struct file_struct *receive_file_
strlcpy(lastname, thisname, MAXPATHLEN);
clean_fname(thisname, 0);
if (sanitize_paths)
-@@ -1075,6 +1082,9 @@ struct file_list *send_file_list(int f,
+@@ -1070,6 +1077,9 @@ struct file_list *send_file_list(int f,
start_write = stats.total_written;
gettimeofday(&start_tv, NULL);
flist = flist_new(WITH_HLINK, "send_file_list");
io_start_buffering_out();
-@@ -1257,6 +1267,9 @@ struct file_list *send_file_list(int f,
+@@ -1252,6 +1262,9 @@ struct file_list *send_file_list(int f,
stats.flist_size = stats.total_written - start_write;
stats.num_files = flist->count;
if (verbose > 3)
output_flist(flist, who_am_i());
-@@ -1278,6 +1291,9 @@ struct file_list *recv_file_list(int f)
+@@ -1273,6 +1286,9 @@ struct file_list *recv_file_list(int f)
start_read = stats.total_read;
flist = flist_new(WITH_HLINK, "recv_file_list");
received_flist = flist;
-@@ -1331,6 +1347,9 @@ struct file_list *recv_file_list(int f)
+@@ -1326,6 +1342,9 @@ struct file_list *recv_file_list(int f)
io_error |= read_int(f);
}
+ if (verbose > 2)
+ rprintf(FINFO, "Converted filename: %s -> %s\n", src, dest);
+}
---- orig/generator.c 2005-02-19 09:27:48
+--- orig/generator.c 2005-02-20 00:02:23
+++ generator.c 2005-02-03 02:07:33
-@@ -331,7 +331,13 @@ static int find_fuzzy(struct file_struct
+@@ -339,7 +339,13 @@ static int find_fuzzy(struct file_struct
* start sending checksums.
*
* Note that f_out is set to -1 when doing final directory-permission and
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-19 09:27:48
+--- orig/log.c 2005-02-20 00:02:23
+++ log.c 2004-07-03 20:18:02
-@@ -60,6 +60,7 @@ struct {
+@@ -62,6 +62,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-02-16 17:08:13
+--- orig/main.c 2005-02-20 00:02:23
+++ main.c 2004-07-22 00:31:47
@@ -359,7 +359,7 @@ static pid_t do_cmd(char *cmd, char *mac
whole_file = 1;
if (dir)
free(dir);
---- orig/options.c 2005-02-19 09:27:48
+--- orig/options.c 2005-02-20 00:02:23
+++ options.c 2005-02-14 02:50:32
@@ -129,6 +129,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
char *config_file = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
-@@ -310,6 +311,7 @@ void usage(enum logcode F)
+@@ -311,6 +312,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," -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");
-@@ -418,6 +420,7 @@ static struct poptOption long_options[]
+@@ -419,6 +421,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 },