Note that you'll need to run 'make proto' after applying this patch.
---- orig/Makefile.in 2004-08-13 07:18:58
-+++ Makefile.in 2004-07-03 20:18:02
-@@ -35,7 +35,7 @@ OBJS1=rsync.o generator.o receiver.o cle
+--- orig/Makefile.in 2005-11-07 04:29:00
++++ Makefile.in 2005-11-07 04:36:50
+@@ -34,7 +34,7 @@ OBJS1=rsync.o generator.o receiver.o cle
main.o checksum.o match.o syscall.o log.o backup.o
OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
- fileio.o batch.o clientname.o
+ fileio.o batch.o clientname.o chmod.o
-OBJS3=progress.o pipe.o
+OBJS3=progress.o pipe.o fnameconv.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-29 16:08:03
-+++ cleanup.c 2004-07-03 20:18:02
-@@ -24,6 +24,7 @@
- extern int io_error;
+--- orig/cleanup.c 2005-11-10 16:58:36
++++ 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
-@@ -122,6 +123,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)
if (cleanup_fname)
do_unlink(cleanup_fname);
if (code)
---- orig/errcode.h 2003-12-15 08:04:14
-+++ errcode.h 2004-07-02 21:38:59
-@@ -34,6 +34,7 @@
- #define RERR_STREAMIO 12 /* error in rsync protocol data stream */
- #define RERR_MESSAGEIO 13 /* errors with program diagnostics */
+--- orig/errcode.h 2005-12-16 23:48:43
++++ errcode.h 2005-09-29 17:23:35
+@@ -36,6 +36,7 @@
#define RERR_IPC 14 /* error in IPC code */
-+#define RERR_FNAMECONV 15 /* error in filename conversion */
+ #define RERR_CRASHED 15 /* sibling crashed */
+ #define RERR_TERMINATED 16 /* sibling terminated abnormally */
++#define RERR_FNAMECONV 17 /* error in filename conversion */
- #define RERR_SIGNAL 20 /* status returned when sent SIGUSR1, SIGINT */
- #define RERR_WAITCHILD 21 /* some error returned by waitpid() */
---- orig/flist.c 2004-09-21 09:40:27
-+++ flist.c 2004-08-12 18:35:53
-@@ -44,6 +44,7 @@ extern int cvs_exclude;
-
- extern int recurse;
- extern char curr_dir[MAXPATHLEN];
+ #define RERR_SIGNAL1 19 /* status returned when sent SIGUSR1 */
+ #define RERR_SIGNAL 20 /* status returned when sent SIGINT, SIGTERM, SIGHUP */
+--- orig/flist.c 2005-11-10 16:58:36
++++ 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 char *fname_convert_cmd;
- extern char *files_from;
- extern int filesfrom_fd;
+ extern struct stats stats;
+ extern struct file_list *the_file_list;
-@@ -359,7 +360,10 @@ void send_file_entry(struct file_struct
+@@ -336,7 +337,10 @@ void send_file_entry(struct file_struct
io_write_phase = "send_file_entry";
flags = base_flags;
-@@ -572,6 +576,9 @@ void receive_file_entry(struct file_stru
+@@ -544,6 +548,9 @@ static struct file_struct *receive_file_
strlcpy(lastname, thisname, MAXPATHLEN);
clean_fname(thisname, 0);
if (sanitize_paths)
-@@ -1079,6 +1086,9 @@ struct file_list *send_file_list(int f,
-
+@@ -1074,6 +1081,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");
-@@ -1251,6 +1261,9 @@ struct file_list *send_file_list(int f,
- stats.num_files = flist->count;
- }
+ io_start_buffering_out();
+@@ -1286,6 +1296,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);
-@@ -1272,6 +1285,9 @@ struct file_list *recv_file_list(int f)
+@@ -1306,6 +1319,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;
-@@ -1325,6 +1341,9 @@ struct file_list *recv_file_list(int f)
+ flist->count = 0;
+@@ -1357,6 +1373,9 @@ struct file_list *recv_file_list(int f)
io_error |= read_int(f);
}
+
+/**
+ * Runs the filename converter process. Should be called before filename
-+ * conversion begins (actually it's not necessarh, but it keeps the proress report
++ * conversion begins (actually it's not necessarh, but it keeps the progress report
+ * nice and clean.
+ **/
-+void init_fname_convert()
++void init_fname_convert(void)
+{
+ if (fname_convert_cmd && conv_pid < 0) {
+ char *args[MAX_ARGS];
+ if (verbose > 2)
+ rprintf(FINFO, "Converted filename: %s -> %s\n", src, dest);
+}
---- orig/generator.c 2004-09-20 19:50:13
-+++ generator.c 2004-07-03 20:18:02
-@@ -252,6 +252,12 @@ static void generate_and_send_sums(int f
+--- orig/generator.c 2005-12-16 04:03:06
++++ generator.c 2005-03-05 00:29:37
+@@ -761,7 +761,13 @@ static int phase = 0;
+ * When fname is non-null, it must point to a MAXPATHLEN buffer!
*
- * @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-09-07 19:54:51
-+++ log.c 2004-07-03 20:18:02
-@@ -57,6 +57,7 @@ struct {
- { RERR_STREAMIO , "error in rsync protocol data stream" },
- { RERR_MESSAGEIO , "errors with program diagnostics" },
++ * reporting to the sender. */
+ 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-12-16 23:48:44
++++ log.c 2005-12-16 23:49:07
+@@ -68,6 +68,7 @@ struct {
{ RERR_IPC , "error in IPC code" },
+ { RERR_CRASHED , "sibling process crashed" },
+ { RERR_TERMINATED , "sibling process terminated abnormally" },
+ { RERR_FNAMECONV , "error in filename conversion" },
- { RERR_SIGNAL , "received SIGUSR1 or SIGINT" },
- { RERR_WAITCHILD , "some error returned by waitpid()" },
- { RERR_MALLOC , "error allocating core memory buffers" },
---- orig/main.c 2004-09-18 01:49:33
+ { RERR_SIGNAL1 , "received SIGUSR1" },
+ { RERR_SIGNAL , "received SIGINT, SIGTERM, or SIGHUP" },
+ { RERR_WAITCHILD , "waitpid() failed" },
+--- orig/main.c 2005-12-16 23:48:44
+++ main.c 2004-07-22 00:31:47
-@@ -332,7 +332,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -414,7 +414,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 2004-09-20 05:10:48
-+++ options.c 2004-07-03 20:18:02
-@@ -129,6 +129,7 @@ char *backup_dir = NULL;
- char backup_dir_buf[MAXPATHLEN];
- int rsync_port = RSYNC_PORT;
- int link_dest = 0;
+--- orig/options.c 2005-12-16 23:48:44
++++ options.c 2005-10-26 16:49:33
+@@ -142,6 +142,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;
-@@ -280,6 +281,7 @@ void usage(enum logcode F)
+ char *password_file = NULL;
+ char *rsync_path = RSYNC_PATH;
+ char *backup_dir = NULL;
+@@ -330,6 +331,7 @@ void usage(enum logcode F)
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," --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," -C, --cvs-exclude auto ignore files in the same way CVS does\n");
- rprintf(F," --exclude=PATTERN exclude files matching PATTERN\n");
-@@ -378,6 +380,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," --compress-level=NUM explicitly set compression level\n");
+ rprintf(F," -C, --cvs-exclude auto-ignore files the same way CVS does\n");
+@@ -464,6 +466,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 },
- {"daemon", 0, POPT_ARG_NONE, &daemon_opt, 0, 0, 0 },
---- orig/pipe.c 2004-08-12 18:34:38
+ {"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 },
+--- orig/pipe.c 2005-10-24 21:04:45
+++ 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 write_batch;
extern int filesfrom_fd;
-@@ -40,8 +39,10 @@ extern int filesfrom_fd;
+
+@@ -39,8 +38,10 @@ extern int filesfrom_fd;
* If blocking_io is set then use blocking io on both fds. That can be
* used to cope with badly broken rsh implementations like the one on
* Solaris.
{
pid_t pid;
int to_child_pipe[2];
-@@ -56,7 +57,7 @@ pid_t piped_child(char **command, int *f
+@@ -55,7 +56,7 @@ pid_t piped_child(char **command, int *f
exit_cleanup(RERR_IPC);
}
if (pid == -1) {
rsyserr(FERROR, errno, "fork");
exit_cleanup(RERR_IPC);
---- orig/syscall.c 2004-08-02 21:56:59
+--- orig/syscall.c 2005-09-15 18:09:15
+++ syscall.c 2004-07-02 21:39:00
-@@ -231,3 +231,34 @@ char *d_name(struct dirent *di)
+@@ -274,3 +274,34 @@ char *d_name(struct dirent *di)
return di->d_name;
#endif
}
+
+ return result;
+}
---- orig/util.c 2004-09-07 21:45:30
+--- orig/util.c 2005-11-12 20:13:05
+++ util.c 2004-07-03 20:18:02
-@@ -1217,3 +1217,55 @@ void *_realloc_array(void *ptr, unsigned
- return malloc(size * num);
- return realloc(ptr, size * num);
+@@ -1411,3 +1411,55 @@ uint32 fuzzy_distance(const char *s1, in
+
+ return a[len2-1];
}
+
+/**
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff