Note that you'll need to run 'make proto' after applying this patch.
---- orig/Makefile.in 2004-05-15 00:53:53
+--- 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
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 2004-07-02 18:11:26
-+++ cleanup.c 2004-07-03 20:18:02
-@@ -24,6 +24,7 @@
- extern int io_error;
+--- orig/cleanup.c 2005-02-07 20:41:56
++++ 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
-@@ -124,6 +125,8 @@ void _exit_cleanup(int code, const char
- finish_transfer(cleanup_new_fname, fname, cleanup_file, 0);
+@@ -125,6 +126,8 @@ void _exit_cleanup(int code, const char
+ !partial_dir);
}
io_flush(FULL_FLUSH);
+ if (fname_convert_cmd)
#define RERR_SIGNAL 20 /* status returned when sent SIGUSR1, SIGINT */
#define RERR_WAITCHILD 21 /* some error returned by waitpid() */
---- orig/flist.c 2004-06-18 16:23:07
-+++ flist.c 2004-07-03 20:18:02
-@@ -43,6 +43,7 @@ extern int cvs_exclude;
+--- 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 char *fname_convert_cmd;
- extern int recurse;
extern char curr_dir[MAXPATHLEN];
-+extern char *fname_convert_cmd;
- extern char *files_from;
- extern int filesfrom_fd;
-@@ -360,7 +361,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;
-@@ -573,6 +577,9 @@ void receive_file_entry(struct file_stru
+@@ -554,6 +558,9 @@ static struct file_struct *receive_file_
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,
-
+@@ -1071,6 +1078,9 @@ struct file_list *send_file_list(int f,
start_write = stats.total_written;
+ gettimeofday(&start_tv, NULL);
+ 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");
-@@ -1235,6 +1245,9 @@ struct file_list *send_file_list(int f,
- write_batch_flist_info(flist->count, flist->files);
- }
+ io_start_buffering_out();
+@@ -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;
+ if (fname_convert_cmd && !am_server)
+ cleanup_fname_convert();
if (verbose > 3)
output_flist(flist);
-@@ -1256,6 +1269,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;
+ 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)
- }
+@@ -1327,6 +1343,9 @@ struct file_list *recv_file_list(int f)
+ io_error |= read_int(f);
}
+ if (fname_convert_cmd && !am_server)
+ if (verbose > 2)
+ rprintf(FINFO, "Converted filename: %s -> %s\n", src, dest);
+}
---- orig/generator.c 2004-06-30 07:24:45
-+++ generator.c 2004-07-03 20:18:02
-@@ -265,6 +265,12 @@ static void generate_and_send_sums(struc
+--- orig/generator.c 2005-02-27 18:24:42
++++ generator.c 2005-02-03 02:07:33
+@@ -554,7 +554,13 @@ static int find_fuzzy(struct file_struct
+ * start sending checksums.
*
- * @note This comment was added later by mbp who was trying to work it
- * out. It might be wrong.
+ * Note that f_out is set to -1 when doing final directory-permission and
+- * modification-time repair. */
++ * modification-time repair.
+ *
+ * TODO: The filename seen in recv_generator is after filename
+ * conversion. In verbose mode, directories, symlinks and device
+ * 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_struct *file, int i,
- int f_out)
---- orig/log.c 2004-06-09 15:34:38
++ * reporting to the sender. */
+ static void recv_generator(char *fname, struct file_list *flist,
+ struct file_struct *file, int ndx,
+ 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 2004-06-30 07:24:30
-+++ main.c 2004-07-03 20:18:02
-@@ -304,7 +304,7 @@ static pid_t do_cmd(char *cmd, char *mac
- create_flist_from_batch(); /* sets batch_flist */
+--- orig/main.c 2005-03-01 03:39:47
++++ main.c 2004-07-22 00:31:47
+@@ -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 {
+ } else
- ret = piped_child(args,f_in,f_out);
+ ret = piped_child(args, f_in, f_out, blocking_io, 1);
- }
if (dir)
---- orig/options.c 2004-06-20 19:30:00
-+++ options.c 2004-07-03 20:18:02
-@@ -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-03-01 05:49:24
++++ 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 *fname_convert_cmd = NULL;
-
- int verbose = 0;
- int quiet = 0;
-@@ -271,6 +272,7 @@ void usage(enum logcode F)
+ char *password_file = NULL;
+ char *rsync_path = RSYNC_PATH;
+ char *backup_dir = NULL;
+@@ -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," --link-dest=DIR create hardlinks to DIR for unchanged files\n");
- rprintf(F," -P equivalent to --partial --progress\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," -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 },
+ 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");
+@@ -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 },
/* 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 },
---- orig/pipe.c 2004-06-18 16:00:09
+ {"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 },
+--- orig/pipe.c 2005-02-07 20:41:56
+++ pipe.c 2004-07-03 20:18:02
@@ -23,7 +23,6 @@
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);
---- orig/syscall.c 2004-02-18 22:33:21
+--- orig/syscall.c 2005-02-14 02:45:11
+++ syscall.c 2004-07-02 21:39:00
-@@ -231,3 +231,34 @@ char *d_name(struct dirent *di)
+@@ -259,3 +259,34 @@ char *d_name(struct dirent *di)
return di->d_name;
#endif
}
+
+ return result;
+}
---- orig/util.c 2004-06-09 21:54:47
+--- orig/util.c 2005-02-23 02:57:27
+++ util.c 2004-07-03 20:18:02
-@@ -1153,3 +1153,55 @@ void *_realloc_array(void *ptr, unsigned
- return malloc(size * num);
- return realloc(ptr, size * num);
+@@ -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