#define RERR_SIGNAL 20 /* status returned when sent SIGUSR1, SIGINT */
#define RERR_WAITCHILD 21 /* some error returned by waitpid() */
---- orig/flist.c 2005-02-14 02:45:10
-+++ flist.c 2005-02-12 19:26:37
-@@ -67,6 +67,7 @@ extern int sanitize_paths;
- extern int max_delete;
+--- orig/flist.c 2005-02-26 19:27:54
++++ flist.c 2005-02-26 19:32:53
+@@ -59,6 +59,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 filter_list_struct filter_list;
- extern struct filter_list_struct server_filter_list;
-@@ -345,7 +346,10 @@ void send_file_entry(struct file_struct
+ extern char curr_dir[MAXPATHLEN];
+
+@@ -338,7 +339,10 @@ void send_file_entry(struct file_struct
io_write_phase = "send_file_entry";
flags = base_flags;
-@@ -561,6 +565,9 @@ static struct file_struct *receive_file_
+@@ -554,6 +558,9 @@ static struct file_struct *receive_file_
strlcpy(lastname, thisname, MAXPATHLEN);
clean_fname(thisname, 0);
if (sanitize_paths)
-@@ -1074,6 +1081,9 @@ struct file_list *send_file_list(int f,
+@@ -1071,6 +1078,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();
-@@ -1256,6 +1266,9 @@ struct file_list *send_file_list(int f,
+@@ -1253,6 +1263,9 @@ struct file_list *send_file_list(int f,
stats.flist_size = stats.total_written - start_write;
stats.num_files = flist->count;
+ cleanup_fname_convert();
+
if (verbose > 3)
- output_flist(flist, who_am_i());
+ output_flist(flist);
-@@ -1277,6 +1290,9 @@ struct file_list *recv_file_list(int f)
+@@ -1274,6 +1287,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;
-@@ -1330,6 +1346,9 @@ struct file_list *recv_file_list(int f)
+@@ -1327,6 +1343,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-14 02:45:10
+--- orig/generator.c 2005-02-27 18:24:42
+++ generator.c 2005-02-03 02:07:33
-@@ -289,7 +289,13 @@ static int find_fuzzy(struct file_struct
+@@ -554,7 +554,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
+ * 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-07 20:41:56
+ int itemizing, int maybe_PERMS_REPORT,
+--- orig/log.c 2005-02-26 05:22:50
+++ log.c 2004-07-03 20:18:02
-@@ -57,6 +57,7 @@ struct {
+@@ -63,6 +63,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-14 02:45:10
+--- orig/main.c 2005-03-01 03:39:47
+++ main.c 2004-07-22 00:31:47
-@@ -359,7 +359,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -362,7 +362,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-14 02:45:10
+--- orig/options.c 2005-03-01 05:49:24
+++ options.c 2005-02-14 02:50:32
-@@ -129,6 +129,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
+@@ -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;
-@@ -307,6 +308,7 @@ void usage(enum logcode F)
+@@ -318,6 +319,7 @@ void usage(enum logcode F)
+ rprintf(F," -y, --fuzzy find similar file for basis if no dest file\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," -C, --cvs-exclude auto-ignore files the same way CVS does\n");
rprintf(F," -f, --filter=RULE add a file-filtering RULE\n");
-@@ -414,6 +416,7 @@ static struct poptOption long_options[]
- {"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
+@@ -426,6 +428,7 @@ static struct poptOption long_options[]
+ {"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_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 },
+
+ return result;
+}
---- orig/util.c 2005-02-14 02:45:11
+--- orig/util.c 2005-02-23 02:57:27
+++ util.c 2004-07-03 20:18:02
-@@ -1331,3 +1331,55 @@ uint32 fuzzy_distance(const char *s1, in
+@@ -1327,3 +1327,55 @@ uint32 fuzzy_distance(const char *s1, in
return a[len2-1];
}
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff