Before compiling, be sure to run "make proto".
---- orig/generator.c 2004-07-29 16:46:28
-+++ generator.c 2004-07-29 16:42:25
-@@ -43,7 +43,7 @@ extern int io_timeout;
+--- orig/generator.c 2004-09-20 19:57:58
++++ generator.c 2004-07-30 07:28:13
+@@ -45,7 +45,7 @@ extern int io_timeout;
extern int protocol_version;
extern int always_checksum;
extern char *partial_dir;
extern int link_dest;
extern int whole_file;
extern int local_server;
-@@ -413,11 +413,19 @@ static void recv_generator(char *fname,
-
+@@ -426,11 +426,19 @@ static void recv_generator(char *fname,
fnamecmp = fname;
+ fnamecmp_type = G2R_FNAME;
- if (statret == -1 && compare_dest != NULL) {
+ if (statret == -1 && compare_dest[0] != NULL) {
#if HAVE_LINK
if (link_dest && !dry_run) {
if (do_link(fnamecmpbuf, fname) < 0) {
-@@ -433,7 +441,6 @@ static void recv_generator(char *fname,
+@@ -441,15 +449,14 @@ static void recv_generator(char *fname,
+ safe_fname(fname));
+ }
+ fnamecmp = fnamecmpbuf;
+- fnamecmp_type = 0;
++ fnamecmp_type = i;
+ }
} else
#endif
+ {
fnamecmp = fnamecmpbuf;
+- fnamecmp_type = 0;
++ fnamecmp_type = i;
+ }
- statret = 0;
- } else
- *fnamecmpbuf = '\0';
- } else
+ }
+ }
+
--- orig/main.c 2004-07-22 00:10:43
-+++ main.c 2004-07-22 00:30:38
-@@ -58,7 +58,7 @@ extern int filesfrom_fd;
++++ main.c 2004-07-30 07:23:54
+@@ -59,7 +59,7 @@ extern int filesfrom_fd;
extern pid_t cleanup_child_pid;
extern char *files_from;
extern char *remote_filesfrom_file;
extern char *rsync_path;
extern char *shell_cmd;
extern char *batch_name;
-@@ -458,7 +458,7 @@ static int do_recv(int f_in,int f_out,st
+@@ -463,7 +463,7 @@ static int do_recv(int f_in,int f_out,st
int pid;
int status = 0;
int error_pipe[2], name_pipe[2];
- BOOL need_name_pipe = compare_dest && !dry_run;
+ BOOL need_name_pipe = compare_dest[0] && !dry_run;
- if (preserve_hard_links)
- init_hard_links(flist);
---- orig/options.c 2004-07-29 16:08:03
-+++ options.c 2004-07-29 16:31:11
+ /* The receiving side mustn't obey this, or an existing symlink that
+ * points to an identical file won't be replaced by the referent. */
+--- orig/options.c 2004-09-20 05:10:48
++++ options.c 2004-08-13 07:55:37
@@ -114,12 +114,13 @@ int write_batch = 0;
int read_batch = 0;
int backup_dir_len = 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 },
-@@ -594,8 +596,28 @@ int parse_arguments(int *argc, const cha
+@@ -605,8 +607,28 @@ int parse_arguments(int *argc, const cha
select_timeout = io_timeout;
break;
+ }
+ arg = poptGetOptArg(pc);
+ if (sanitize_paths)
-+ arg = alloc_sanitize_path(arg, curr_dir);
++ arg = sanitize_path(NULL, arg, NULL, 0);
+ compare_dest[num_comp_dest++] = (char *)arg;
+ saw_compare_dest = 1;
+ break;
+ }
+ arg = poptGetOptArg(pc);
+ if (sanitize_paths)
-+ arg = alloc_sanitize_path(arg, curr_dir);
++ arg = sanitize_path(NULL, arg, NULL, 0);
+ compare_dest[num_comp_dest++] = (char *)arg;
link_dest = 1;
break;
#else
-@@ -693,6 +715,11 @@ int parse_arguments(int *argc, const cha
- exit_cleanup(RERR_SYNTAX);
+@@ -699,6 +721,11 @@ int parse_arguments(int *argc, const cha
+ return 0;
}
+ if (saw_compare_dest && link_dest) {
if (archive_mode) {
if (!files_from)
recurse = 1;
-@@ -723,8 +750,6 @@ int parse_arguments(int *argc, const cha
- tmpdir = alloc_sanitize_path(tmpdir, curr_dir);
+@@ -729,8 +756,6 @@ int parse_arguments(int *argc, const cha
+ tmpdir = sanitize_path(NULL, tmpdir, NULL, 0);
if (partial_dir)
- partial_dir = alloc_sanitize_path(partial_dir, curr_dir);
+ partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
- if (compare_dest)
-- compare_dest = alloc_sanitize_path(compare_dest, curr_dir);
+- compare_dest = sanitize_path(NULL, compare_dest, NULL, 0);
if (backup_dir)
- backup_dir = alloc_sanitize_path(backup_dir, curr_dir);
+ backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
if (files_from)
-@@ -839,8 +864,8 @@ int parse_arguments(int *argc, const cha
+@@ -738,6 +763,7 @@ int parse_arguments(int *argc, const cha
+ }
+ if (server_exclude_list.head && !am_sender) {
+ struct exclude_list_struct *elp = &server_exclude_list;
++ int i;
+ if (tmpdir) {
+ clean_fname(tmpdir, 1);
+ if (check_exclude(elp, tmpdir, 1) < 0)
+@@ -748,9 +774,9 @@ int parse_arguments(int *argc, const cha
+ if (check_exclude(elp, partial_dir, 1) < 0)
+ goto options_rejected;
+ }
+- if (compare_dest) {
+- clean_fname(compare_dest, 1);
+- if (check_exclude(elp, compare_dest, 1) < 0)
++ for (i = 0; i < num_comp_dest; i++) {
++ clean_fname(compare_dest[i], 1);
++ if (check_exclude(elp, compare_dest[i], 1) < 0)
+ goto options_rejected;
+ }
+ if (backup_dir) {
+@@ -890,8 +916,8 @@ int parse_arguments(int *argc, const cha
**/
void server_options(char **args,int *argc)
{
char *arg;
int i, x;
-@@ -1021,13 +1046,16 @@ void server_options(char **args,int *arg
+@@ -1074,13 +1100,16 @@ void server_options(char **args,int *arg
args[ac++] = tmpdir;
}
}
if (files_from && (!am_sender || remote_filesfrom_file)) {
---- orig/receiver.c 2004-07-23 21:59:07
-+++ receiver.c 2004-07-23 22:05:04
-@@ -39,7 +39,6 @@ extern int cvs_exclude;
+--- orig/receiver.c 2004-09-07 21:57:20
++++ receiver.c 2004-07-30 07:31:12
+@@ -38,7 +38,7 @@ extern int cvs_exclude;
extern int io_error;
extern char *tmpdir;
extern char *partial_dir;
-extern char *compare_dest;
++extern char *compare_dest[];
extern int make_backups;
extern int do_progress;
extern char *backup_dir;
---- orig/rsync.h 2004-07-29 16:08:03
-+++ rsync.h 2004-07-03 17:33:30
+@@ -438,7 +438,8 @@ int recv_files(int f_in, struct file_lis
+ partialptr = partial_dir ? partial_dir_fname(fname) : fname;
+
+ if (f_in_name >= 0) {
+- switch (read_byte(f_in_name)) {
++ uchar j;
++ switch (j = read_byte(f_in_name)) {
+ case G2R_FNAME:
+ fnamecmp = fname;
+ break;
+@@ -450,7 +451,7 @@ int recv_files(int f_in, struct file_lis
+ break;
+ default:
+ pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
+- compare_dest, fname);
++ compare_dest[j], fname);
+ fnamecmp = fnamecmpbuf;
+ break;
+ }
+--- orig/rsync.h 2004-09-07 21:52:22
++++ rsync.h 2004-07-30 07:23:54
@@ -98,6 +98,8 @@
#define MAX_ARGS 1000
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff