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-01-10 09:46:11
+--- orig/cleanup.c 2005-01-28 23:01:07
+++ cleanup.c 2005-01-10 10:40:51
@@ -25,6 +25,7 @@ extern int io_error;
extern int keep_partial;
/**
* Close all open sockets and files, allowing a (somewhat) graceful
-@@ -126,6 +127,8 @@ void _exit_cleanup(int code, const char
+@@ -125,6 +126,8 @@ void _exit_cleanup(int code, const char
!partial_dir);
}
io_flush(FULL_FLUSH);
#define RERR_SIGNAL 20 /* status returned when sent SIGUSR1, SIGINT */
#define RERR_WAITCHILD 21 /* some error returned by waitpid() */
---- orig/flist.c 2005-01-24 01:43:09
+--- orig/flist.c 2005-02-03 02:04:20
+++ flist.c 2005-01-21 19:10:03
-@@ -70,6 +70,7 @@ extern int delete_excluded;
+@@ -69,6 +69,7 @@ extern int delete_excluded;
extern int max_delete;
extern int orig_umask;
extern int list_only;
+extern char *fname_convert_cmd;
- extern struct exclude_list_struct exclude_list;
- extern struct exclude_list_struct server_exclude_list;
-@@ -365,7 +366,10 @@ void send_file_entry(struct file_struct
+ extern struct filter_list_struct filter_list;
+ extern struct filter_list_struct server_filter_list;
+@@ -348,7 +349,10 @@ void send_file_entry(struct file_struct
io_write_phase = "send_file_entry";
flags = base_flags;
-@@ -581,6 +585,9 @@ void receive_file_entry(struct file_stru
+@@ -564,6 +568,9 @@ static void receive_file_entry(struct fi
strlcpy(lastname, thisname, MAXPATHLEN);
clean_fname(thisname, 0);
if (sanitize_paths)
-@@ -1110,6 +1117,9 @@ struct file_list *send_file_list(int f,
-
+@@ -1081,6 +1088,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");
-@@ -1287,6 +1297,9 @@ struct file_list *send_file_list(int f,
+@@ -1269,6 +1279,9 @@ struct file_list *send_file_list(int f,
stats.num_files = flist->count;
}
if (verbose > 3)
output_flist(flist, f < 0 ? "delete" : who_am_i());
-@@ -1308,6 +1321,9 @@ struct file_list *recv_file_list(int f)
+@@ -1290,6 +1303,9 @@ struct file_list *recv_file_list(int f)
start_read = stats.total_read;
flist = flist_new(WITH_HLINK, "recv_file_list");
received_flist = flist;
-@@ -1361,6 +1377,9 @@ struct file_list *recv_file_list(int f)
+@@ -1343,6 +1359,9 @@ struct file_list *recv_file_list(int f)
io_error |= read_int(f);
}
+ if (verbose > 2)
+ rprintf(FINFO, "Converted filename: %s -> %s\n", src, dest);
+}
---- orig/generator.c 2005-01-24 01:43:09
-+++ generator.c 2004-07-03 20:18:02
-@@ -233,6 +233,12 @@ static void generate_and_send_sums(int f
+--- orig/generator.c 2005-02-03 02:04:20
++++ generator.c 2005-02-03 02:07:33
+@@ -235,7 +235,13 @@ static void generate_and_send_sums(int f
+ * 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.
- */
++ * reporting to the sender. */
static void recv_generator(char *fname, struct file_list *flist,
- struct file_struct *file, int i,
---- orig/log.c 2004-09-07 19:54:51
+ struct file_struct *file, int ndx,
+ int f_out, int f_out_name)
+--- orig/log.c 2005-02-01 10:39:22
+++ log.c 2004-07-03 20:18:02
@@ -57,6 +57,7 @@ struct {
{ RERR_STREAMIO , "error in rsync protocol data stream" },
{ RERR_SIGNAL , "received SIGUSR1 or SIGINT" },
{ RERR_WAITCHILD , "some error returned by waitpid()" },
{ RERR_MALLOC , "error allocating core memory buffers" },
---- orig/main.c 2005-01-24 01:43:10
+--- orig/main.c 2005-01-30 10:07:21
+++ main.c 2004-07-22 00:31:47
-@@ -335,7 +335,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -361,7 +361,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-01-24 01:43:10
-+++ options.c 2005-01-15 21:28:07
+--- orig/options.c 2005-02-01 10:39:22
++++ options.c 2005-01-28 19:29:38
@@ -129,6 +129,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
char *config_file = NULL;
char *shell_cmd = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
-@@ -296,6 +297,7 @@ void usage(enum logcode F)
+@@ -303,6 +304,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," -P equivalent to --partial --progress\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");
-@@ -395,6 +397,7 @@ static struct poptOption long_options[]
+ 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");
+@@ -408,6 +410,7 @@ static struct poptOption long_options[]
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
if (pid == -1) {
rsyserr(FERROR, errno, "fork");
exit_cleanup(RERR_IPC);
---- orig/syscall.c 2005-01-19 20:11:10
+--- orig/syscall.c 2005-01-28 23:01:10
+++ syscall.c 2004-07-02 21:39:00
-@@ -270,3 +270,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 2005-01-20 23:05:34
+--- orig/util.c 2005-01-28 19:08:20
+++ util.c 2004-07-03 20:18:02
@@ -1213,3 +1213,55 @@ void *_realloc_array(void *ptr, unsigned
return malloc(size * num);
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff