--- Makefile.in 15 May 2004 00:48:11 -0000 1.101
-+++ Makefile.in 29 May 2004 21:31:45 -0000
++++ Makefile.in 18 Jun 2004 17:25:38 -0000
@@ -35,7 +35,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 \
popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
popt/popthelp.o popt/poptparse.o
--- cleanup.c 13 May 2004 07:08:18 -0000 1.22
-+++ cleanup.c 29 May 2004 21:31:45 -0000
++++ cleanup.c 18 Jun 2004 17:25:38 -0000
@@ -24,6 +24,7 @@
extern int io_error;
extern int keep_partial;
do_unlink(cleanup_fname);
if (code) {
--- errcode.h 15 Dec 2003 08:04:14 -0000 1.8
-+++ errcode.h 29 May 2004 21:31:45 -0000
++++ errcode.h 18 Jun 2004 17:25:38 -0000
@@ -34,6 +34,7 @@
#define RERR_STREAMIO 12 /* error in rsync protocol data stream */
#define RERR_MESSAGEIO 13 /* errors with program diagnostics */
#define RERR_SIGNAL 20 /* status returned when sent SIGUSR1, SIGINT */
#define RERR_WAITCHILD 21 /* some error returned by waitpid() */
---- flist.c 29 May 2004 21:21:17 -0000 1.226
-+++ flist.c 29 May 2004 21:31:46 -0000
+--- flist.c 18 Jun 2004 16:29:21 -0000 1.231
++++ flist.c 18 Jun 2004 17:25:38 -0000
@@ -43,6 +43,7 @@ extern int cvs_exclude;
extern int recurse;
extern char *files_from;
extern int filesfrom_fd;
-@@ -346,7 +347,10 @@ void send_file_entry(struct file_struct
+@@ -360,7 +361,10 @@ void send_file_entry(struct file_struct
io_write_phase = "send_file_entry";
flags = base_flags;
-@@ -559,6 +563,9 @@ void receive_file_entry(struct file_stru
+@@ -573,6 +577,9 @@ void receive_file_entry(struct file_stru
strlcpy(lastname, thisname, MAXPATHLEN);
clean_fname(thisname);
if (sanitize_paths)
-@@ -1041,6 +1048,9 @@ struct file_list *send_file_list(int f,
+@@ -1061,6 +1068,9 @@ struct file_list *send_file_list(int f,
start_write = stats.total_written;
flist = flist_new(f == -1 ? WITHOUT_HLINK : WITH_HLINK,
"send_file_list");
-@@ -1215,6 +1225,9 @@ struct file_list *send_file_list(int f,
+@@ -1235,6 +1245,9 @@ struct file_list *send_file_list(int f,
write_batch_flist_info(flist->count, flist->files);
}
if (verbose > 3)
output_flist(flist);
-@@ -1237,6 +1250,9 @@ struct file_list *recv_file_list(int f)
+@@ -1256,6 +1269,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;
-@@ -1291,6 +1307,9 @@ struct file_list *recv_file_list(int f)
+@@ -1310,6 +1326,9 @@ struct file_list *recv_file_list(int f)
}
}
output_flist(flist);
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ fnameconv.c 29 May 2004 21:31:46 -0000
++++ fnameconv.c 18 Jun 2004 17:25:38 -0000
@@ -0,0 +1,220 @@
+/* -*- c-file-style: "linux" -*-
+ *
+ if (verbose > 2)
+ rprintf(FINFO, "Converted filename: %s -> %s\n", src, dest);
+}
---- generator.c 18 May 2004 08:50:17 -0000 1.85
-+++ generator.c 29 May 2004 21:31:46 -0000
-@@ -267,6 +267,12 @@ static void generate_and_send_sums(struc
+--- generator.c 18 Jun 2004 16:30:24 -0000 1.88
++++ generator.c 18 Jun 2004 17:25:38 -0000
+@@ -268,6 +268,12 @@ static void generate_and_send_sums(struc
*
* @note This comment was added later by mbp who was trying to work it
* out. It might be wrong.
**/
void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
{
---- log.c 15 May 2004 19:31:16 -0000 1.73
-+++ log.c 29 May 2004 21:31:47 -0000
+--- log.c 7 Jun 2004 22:51:14 -0000 1.74
++++ log.c 18 Jun 2004 17:25:39 -0000
@@ -57,6 +57,7 @@ struct {
{ RERR_STREAMIO , "error in rsync protocol data stream" },
{ RERR_MESSAGEIO , "errors with program diagnostics" },
{ RERR_SIGNAL , "received SIGUSR1 or SIGINT" },
{ RERR_WAITCHILD , "some error returned by waitpid()" },
{ RERR_MALLOC , "error allocating core memory buffers" },
---- main.c 19 May 2004 22:19:19 -0000 1.195
-+++ main.c 29 May 2004 21:31:47 -0000
-@@ -217,7 +217,7 @@ static pid_t do_cmd(char *cmd, char *mac
+--- main.c 18 Jun 2004 16:50:20 -0000 1.198
++++ main.c 18 Jun 2004 17:25:39 -0000
+@@ -219,7 +219,7 @@ static pid_t do_cmd(char *cmd, char *mac
int *f_in, int *f_out)
{
int i, argc = 0;
pid_t ret;
char *tok, *dir = NULL;
int dash_l_set = 0;
-@@ -232,8 +232,13 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -234,8 +234,13 @@ static pid_t do_cmd(char *cmd, char *mac
if (!cmd)
goto oom;
/* check to see if we've already been given '-l user' in
* the remote-shell command */
-@@ -296,7 +301,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -298,7 +303,7 @@ static pid_t do_cmd(char *cmd, char *mac
create_flist_from_batch(); /* sets batch_flist */
ret = local_child(argc, args, f_in, f_out, child_main);
} else {
}
if (dir) free(dir);
---- options.c 27 May 2004 21:51:53 -0000 1.153
-+++ options.c 29 May 2004 21:31:48 -0000
-@@ -125,6 +125,7 @@ char *backup_dir = NULL;
+--- options.c 7 Jun 2004 22:05:22 -0000 1.156
++++ options.c 18 Jun 2004 17:25:39 -0000
+@@ -127,6 +127,7 @@ char *backup_dir = NULL;
char backup_dir_buf[MAXPATHLEN];
int rsync_port = RSYNC_PORT;
int link_dest = 0;
int verbose = 0;
int quiet = 0;
-@@ -268,6 +269,7 @@ void usage(enum logcode F)
+@@ -271,6 +272,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," -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");
-@@ -364,6 +366,7 @@ static struct poptOption long_options[]
+@@ -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 },
/* 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 },
---- pipe.c 15 May 2004 19:31:10 -0000 1.7
-+++ pipe.c 29 May 2004 21:31:48 -0000
+--- pipe.c 18 Jun 2004 16:00:33 -0000 1.8
++++ pipe.c 18 Jun 2004 17:25:39 -0000
@@ -23,7 +23,6 @@
extern int am_sender;
{
pid_t pid;
int to_child_pipe[2];
-@@ -57,7 +58,7 @@ pid_t piped_child(char **command, int *f
+@@ -56,7 +57,7 @@ pid_t piped_child(char **command, int *f
+ exit_cleanup(RERR_IPC);
}
-
- pid = do_fork();
+ pid = register_child ? do_fork() : fork();
if (pid == -1) {
rsyserr(FERROR, errno, "fork");
exit_cleanup(RERR_IPC);
--- syscall.c 18 Feb 2004 22:33:21 -0000 1.30
-+++ syscall.c 29 May 2004 21:31:48 -0000
++++ syscall.c 18 Jun 2004 17:25:39 -0000
@@ -231,3 +231,34 @@ char *d_name(struct dirent *di)
return di->d_name;
#endif
+
+ return result;
+}
---- util.c 24 May 2004 22:59:16 -0000 1.147
-+++ util.c 29 May 2004 21:31:48 -0000
-@@ -1135,3 +1135,52 @@ void *_realloc_array(void *ptr, unsigned
+--- util.c 9 Jun 2004 21:51:07 -0000 1.149
++++ util.c 18 Jun 2004 17:25:40 -0000
+@@ -1153,3 +1153,52 @@ void *_realloc_array(void *ptr, unsigned
return malloc(size * num);
return realloc(ptr, size * num);
}