Note that you'll need to run 'make proto' after applying this patch.
---- orig/Makefile.in 2004-11-02 16:47:15
+--- orig/Makefile.in 2005-07-07 23:11:07
+++ Makefile.in 2004-07-03 20:18:02
-@@ -35,7 +35,7 @@ OBJS1=rsync.o generator.o receiver.o cle
+@@ -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
if (cleanup_fname)
do_unlink(cleanup_fname);
if (code)
---- orig/errcode.h 2005-03-16 02:19:29.823770469
+--- orig/errcode.h 2005-04-13 02:59:47
+++ errcode.h 2004-07-02 21:38:59
-@@ -35,6 +35,7 @@
+@@ -34,6 +34,7 @@
#define RERR_STREAMIO 12 /* error in rsync protocol data stream */
#define RERR_MESSAGEIO 13 /* errors with program diagnostics */
#define RERR_IPC 14 /* error in IPC code */
#define RERR_SIGNAL 20 /* status returned when sent SIGUSR1, SIGINT */
#define RERR_WAITCHILD 21 /* some error returned by waitpid() */
---- orig/flist.c 2005-03-16 02:19:29.897764030
+--- orig/flist.c 2005-08-17 06:45:07
+++ flist.c 2005-03-05 00:29:08
@@ -57,6 +57,7 @@ extern int copy_unsafe_links;
extern int protocol_version;
extern struct stats stats;
extern struct file_list *the_file_list;
-@@ -338,7 +339,10 @@ void send_file_entry(struct file_struct
+@@ -339,7 +340,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_
+@@ -555,6 +559,9 @@ static struct file_struct *receive_file_
strlcpy(lastname, thisname, MAXPATHLEN);
clean_fname(thisname, 0);
if (sanitize_paths)
-@@ -1081,6 +1088,9 @@ struct file_list *send_file_list(int f,
+@@ -1085,6 +1092,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();
-@@ -1265,6 +1275,9 @@ struct file_list *send_file_list(int f,
+@@ -1288,6 +1298,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);
-@@ -1286,6 +1299,9 @@ struct file_list *recv_file_list(int f)
+@@ -1309,6 +1322,9 @@ struct file_list *recv_file_list(int f)
start_read = stats.total_read;
flist = flist_new(WITH_HLINK, "recv_file_list");
flist->count = 0;
-@@ -1338,6 +1354,9 @@ struct file_list *recv_file_list(int f)
+@@ -1361,6 +1377,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-03-16 02:19:29.980756807
+--- orig/generator.c 2005-08-17 06:45:07
+++ generator.c 2005-03-05 00:29:37
-@@ -581,7 +581,13 @@ static int phase = 0;
+@@ -593,7 +593,13 @@ static int phase = 0;
* start sending checksums.
*
* Note that f_out is set to -1 when doing final directory-permission and
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-03-16 02:19:30.009754284
+--- orig/log.c 2005-06-10 21:33:28
+++ log.c 2004-07-03 20:18:02
-@@ -64,6 +64,7 @@ struct {
+@@ -65,6 +65,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-03-16 02:19:30.077748367
+--- orig/main.c 2005-07-27 23:31:12
+++ main.c 2004-07-22 00:31:47
-@@ -363,7 +363,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -368,7 +368,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-03-16 02:19:30.152741841
-+++ options.c 2005-02-14 02:50:32
-@@ -137,6 +137,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
+--- orig/options.c 2005-08-27 21:11:26
++++ options.c 2005-08-27 21:20:59
+@@ -138,6 +138,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;
-@@ -320,6 +321,7 @@ void usage(enum logcode F)
+@@ -322,6 +323,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," -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");
-@@ -429,6 +431,7 @@ static struct poptOption long_options[]
+@@ -447,6 +449,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:36:43
+ {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
+++ 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 00:58:10
+--- orig/syscall.c 2005-07-27 23:31:12
+++ syscall.c 2004-07-02 21:39:00
-@@ -259,3 +259,34 @@ char *d_name(struct dirent *di)
+@@ -270,3 +270,34 @@ char *d_name(struct dirent *di)
return di->d_name;
#endif
}
+
+ return result;
+}
---- orig/util.c 2005-03-11 17:36:35
+--- orig/util.c 2005-08-17 06:45:08
+++ util.c 2004-07-03 20:18:02
-@@ -1328,3 +1328,55 @@ uint32 fuzzy_distance(const char *s1, in
+@@ -1348,3 +1348,55 @@ uint32 fuzzy_distance(const char *s1, in
return a[len2-1];
}
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff