Note that you'll need to run 'make proto' after applying this patch.
---- 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
+--- 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 2005-02-07 20:41:56
+--- 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;
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 2005-02-26 19:27:54
-+++ flist.c 2005-02-26 19:32:53
-@@ -59,6 +59,7 @@ extern int copy_unsafe_links;
+ #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 struct stats stats;
+ extern struct file_list *the_file_list;
- extern char curr_dir[MAXPATHLEN];
-
-@@ -338,7 +339,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;
-@@ -554,6 +558,9 @@ static struct file_struct *receive_file_
+@@ -544,6 +548,9 @@ static struct file_struct *receive_file_
strlcpy(lastname, thisname, MAXPATHLEN);
clean_fname(thisname, 0);
if (sanitize_paths)
-@@ -1071,6 +1078,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);
flist = flist_new(WITH_HLINK, "send_file_list");
io_start_buffering_out();
-@@ -1253,6 +1263,9 @@ struct file_list *send_file_list(int f,
+@@ -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 (verbose > 3)
output_flist(flist);
-@@ -1274,6 +1287,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;
-@@ -1327,6 +1343,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 2005-02-26 19:27:54
-+++ generator.c 2005-02-03 02:07:33
-@@ -554,7 +554,13 @@ static int find_fuzzy(struct file_struct
- * start sending checksums.
+--- 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 that f_out is set to -1 when doing final directory-permission and
- * modification-time repair. */
+ * 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_list *flist,
- struct file_struct *file, int ndx,
+ static void recv_generator(char *fname, 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
-@@ -63,6 +63,7 @@ struct {
- { RERR_STREAMIO , "error in rsync protocol data stream" },
- { RERR_MESSAGEIO , "errors with program diagnostics" },
+ 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 2005-02-26 19:27:54
+ { 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
-@@ -362,7 +362,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 2005-02-25 18:44:31
-+++ options.c 2005-02-14 02:50:32
-@@ -137,6 +137,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
+--- 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 *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");
+@@ -330,6 +331,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," --fname-convert=CMD invoke CMD for filename conversion\n");
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");
- 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 },
+@@ -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 },
- {"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 },
---- orig/pipe.c 2005-02-07 20:41:56
+ {"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 2005-02-14 02:45:11
+--- orig/syscall.c 2005-09-15 18:09:15
+++ syscall.c 2004-07-02 21:39:00
-@@ -259,3 +259,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 2005-02-23 02:57:27
+--- orig/util.c 2005-11-12 20:13:05
+++ util.c 2004-07-03 20:18:02
-@@ -1327,3 +1327,55 @@ uint32 fuzzy_distance(const char *s1, in
+@@ -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