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-02-07 20:41:56
+++ 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-28 19:08:20
-+++ flist.c 2005-01-21 19:10:03
-@@ -69,6 +69,7 @@ extern int delete_excluded;
+--- orig/flist.c 2005-02-14 02:45:10
++++ flist.c 2005-02-12 19:26:37
+@@ -67,6 +67,7 @@ extern int sanitize_paths;
extern int max_delete;
extern int orig_umask;
extern int list_only;
extern struct filter_list_struct filter_list;
extern struct filter_list_struct server_filter_list;
-@@ -356,7 +357,10 @@ void send_file_entry(struct file_struct
+@@ -345,7 +346,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
+@@ -561,6 +565,9 @@ static struct file_struct *receive_file_
strlcpy(lastname, thisname, MAXPATHLEN);
clean_fname(thisname, 0);
if (sanitize_paths)
-@@ -1088,6 +1095,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");
-@@ -1291,6 +1301,9 @@ struct file_list *send_file_list(int f,
- stats.num_files = flist->count;
- }
+ io_start_buffering_out();
+@@ -1256,6 +1266,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, f < 0 ? "delete" : who_am_i());
+ output_flist(flist, who_am_i());
-@@ -1312,6 +1325,9 @@ struct file_list *recv_file_list(int f)
+@@ -1277,6 +1290,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;
-@@ -1365,6 +1381,9 @@ struct file_list *recv_file_list(int f)
+@@ -1330,6 +1346,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-25 12:14:14
-+++ generator.c 2004-07-03 20:18:02
-@@ -235,6 +235,12 @@ static void generate_and_send_sums(int f
+--- orig/generator.c 2005-02-14 02:45:10
++++ generator.c 2005-02-03 02:07:33
+@@ -289,7 +289,13 @@ static int find_fuzzy(struct file_struct
+ * 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 2005-01-28 19:08:20
+ struct file_struct *file, int ndx,
+ int f_out, int f_out_name)
+--- orig/log.c 2005-02-07 20:41:56
+++ 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-28 19:08:20
+--- orig/main.c 2005-02-14 02:45:10
+++ main.c 2004-07-22 00:31:47
-@@ -355,7 +355,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -359,7 +359,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-28 19:08:20
-+++ options.c 2005-01-28 19:29:38
+--- orig/options.c 2005-02-14 02:45:10
++++ options.c 2005-02-14 02:50:32
@@ -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;
-@@ -303,6 +304,7 @@ void usage(enum logcode F)
+@@ -307,6 +308,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\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");
-@@ -408,6 +410,7 @@ static struct poptOption long_options[]
- {"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
+@@ -414,6 +416,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 2004-08-12 18:34:38
+--- orig/pipe.c 2005-02-07 20:41:56
+++ pipe.c 2004-07-03 20:18:02
@@ -23,7 +23,6 @@
if (pid == -1) {
rsyserr(FERROR, errno, "fork");
exit_cleanup(RERR_IPC);
---- orig/syscall.c 2005-01-28 17:12:14
+--- orig/syscall.c 2005-02-14 02:45:11
+++ syscall.c 2004-07-02 21:39:00
@@ -259,3 +259,34 @@ char *d_name(struct dirent *di)
return di->d_name;
+
+ return result;
+}
---- orig/util.c 2005-01-28 19:08:20
+--- orig/util.c 2005-02-14 02:45:11
+++ util.c 2004-07-03 20:18:02
-@@ -1213,3 +1213,55 @@ void *_realloc_array(void *ptr, unsigned
- return malloc(size * num);
- return realloc(ptr, size * num);
+@@ -1331,3 +1331,55 @@ uint32 fuzzy_distance(const char *s1, in
+
+ return a[len2-1];
}
+
+/**
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff