#define RERR_SIGNAL 20 /* status returned when sent SIGUSR1, SIGINT */
#define RERR_WAITCHILD 21 /* some error returned by waitpid() */
#define RERR_SIGNAL 20 /* status returned when sent SIGUSR1, SIGINT */
#define RERR_WAITCHILD 21 /* some error returned by waitpid() */
+++ flist.c 2005-03-05 00:29:08
@@ -57,6 +57,7 @@ extern int copy_unsafe_links;
extern int protocol_version;
+++ flist.c 2005-03-05 00:29:08
@@ -57,6 +57,7 @@ extern int copy_unsafe_links;
extern int protocol_version;
-@@ -1077,6 +1084,9 @@ struct file_list *send_file_list(int f,
+@@ -1064,6 +1071,9 @@ struct file_list *send_file_list(int f,
start_write = stats.total_written;
gettimeofday(&start_tv, NULL);
start_write = stats.total_written;
gettimeofday(&start_tv, NULL);
flist = flist_new(WITH_HLINK, "send_file_list");
io_start_buffering_out();
flist = flist_new(WITH_HLINK, "send_file_list");
io_start_buffering_out();
-@@ -1281,6 +1291,9 @@ struct file_list *send_file_list(int f,
+@@ -1268,6 +1278,9 @@ struct file_list *send_file_list(int f,
+ if (verbose > 2)
+ rprintf(FINFO, "Converted filename: %s -> %s\n", src, dest);
+}
+ if (verbose > 2)
+ rprintf(FINFO, "Converted filename: %s -> %s\n", src, dest);
+}
static void recv_generator(char *fname, struct file_struct *file, int ndx,
int itemizing, int maybe_PERMS_REPORT,
enum logcode code, int f_out)
static void recv_generator(char *fname, struct file_struct *file, int ndx,
int itemizing, int maybe_PERMS_REPORT,
enum logcode code, int f_out)
+++ log.c 2005-09-29 17:23:54
@@ -67,6 +67,7 @@ struct {
{ RERR_IPC , "error in IPC code" },
+++ log.c 2005-09-29 17:23:54
@@ -67,6 +67,7 @@ struct {
{ RERR_IPC , "error in IPC code" },
{ RERR_TERMINATED , "sibling process terminated abnormally" },
+ { RERR_FNAMECONV , "error in filename conversion" },
{ RERR_SIGNAL , "received SIGUSR1 or SIGINT" },
{ RERR_TERMINATED , "sibling process terminated abnormally" },
+ { RERR_FNAMECONV , "error in filename conversion" },
{ RERR_SIGNAL , "received SIGUSR1 or SIGINT" },
-@@ -384,7 +384,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -391,7 +391,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
whole_file = 1;
ret = local_child(argc, args, f_in, f_out, child_main);
} else
---- orig/options.c 2005-09-29 07:42:04
-+++ options.c 2005-08-27 21:20:59
-@@ -138,6 +138,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
+--- orig/options.c 2005-10-26 16:49:08
++++ options.c 2005-10-26 16:49:33
+@@ -141,6 +141,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
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 during the transfer\n");
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 during the transfer\n");
- rprintf(F," -f, --filter=RULE add a file-filtering RULE\n");
-@@ -447,6 +449,7 @@ static struct poptOption long_options[]
+@@ -454,6 +456,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 },
{"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 },
- {"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 },
+ {"compress", 'z', POPT_ARG_NONE, 0, 'z', 0, 0 },
+ {"compress-level", 0, POPT_ARG_INT, &def_compress_level, 'z', 0, 0 },
{0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 },
{0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 },
- {"progress", 0, POPT_ARG_VAL, &do_progress, 1, 0, 0 },
---- orig/pipe.c 2005-04-09 18:00:29
+--- orig/pipe.c 2005-10-24 21:04:45
-@@ -1348,3 +1348,55 @@ uint32 fuzzy_distance(const char *s1, in
+@@ -1353,3 +1353,55 @@ uint32 fuzzy_distance(const char *s1, in