+Depends-On-Patch: partial-dir.diff
+Depends-On-Patch: g2r-basis-filename.diff
+
This patch allows multiple --compare-dest or --link-dest options to be
used, making the transfer of some files more optimal. Note that the
algorithm does NOT search for the best match -- it stops at the first
Before compiling, be sure to run "make proto".
---- generator.c 30 Jun 2004 07:27:30 -0000 1.93
-+++ generator.c 30 Jun 2004 07:40:25 -0000
-@@ -42,7 +42,7 @@ extern int size_only;
- extern int io_timeout;
+--- orig/generator.c 2004-07-28 10:14:15
++++ generator.c 2004-07-28 10:19:57
+@@ -43,7 +43,7 @@ extern int io_timeout;
extern int protocol_version;
extern int always_checksum;
+ extern char *partial_dir;
-extern char *compare_dest;
+extern char *compare_dest[];
extern int link_dest;
}
file_checksum(fname,sum,st->st_size);
return memcmp(sum, file->u.sum, protocol_version < 21 ? 2
-@@ -267,7 +266,7 @@ static void generate_and_send_sums(struc
- * out. It might be wrong.
- */
- static void recv_generator(char *fname, struct file_struct *file, int i,
-- int f_out)
-+ int f_out, int f_nameout)
- {
- int fd;
- STRUCT_STAT st;
-@@ -424,15 +423,22 @@ static void recv_generator(char *fname,
+@@ -422,11 +421,18 @@ static void recv_generator(char *fname,
fnamecmp = fname;
- if (statret == -1 && compare_dest != NULL) {
+ if (statret == -1 && compare_dest[0] != NULL) {
/* try the file at compare_dest instead */
- int saveerrno = errno;
- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, compare_dest, fname);
-- statret = link_stat(fnamecmpbuf, &st, 0);
-- if (!S_ISREG(st.st_mode))
-- statret = -1;
-- if (statret == -1)
+- if (link_stat(fnamecmpbuf, &st, 0) == 0
+- && S_ISREG(st.st_mode)) {
+ int i;
+ for (i = 0; compare_dest[i] != NULL; i++) {
+ pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, compare_dest[i], fname);
-+ if ((statret = link_stat(fnamecmpbuf, &st, 0)) == 0) {
-+ if (S_ISREG(st.st_mode))
-+ break;
-+ statret = -1;
++ if (link_stat(fnamecmpbuf, &st, 0) == 0
++ && S_ISREG(st.st_mode)) {
++ statret = 0;
++ break;
+ }
+ }
-+ if (statret < 0) {
- errno = saveerrno;
-+ *fnamecmpbuf = '\0';
-+ }
++ if (statret == 0) {
#if HAVE_LINK
- else if (link_dest && !dry_run) {
- if (do_link(fnamecmpbuf, fname) != 0) {
-@@ -440,18 +446,22 @@ static void recv_generator(char *fname,
- rsyserr(FINFO, errno, "link %s => %s",
- fnamecmpbuf, fname);
- }
-- }
-- fnamecmp = fnamecmpbuf;
-+ fnamecmp = fnamecmpbuf;
-+ } else
-+ *fnamecmpbuf = '\0';
- }
+ if (link_dest && !dry_run) {
+ if (do_link(fnamecmpbuf, fname) < 0) {
+@@ -442,7 +448,6 @@ static void recv_generator(char *fname,
+ } else
#endif
- else
- fnamecmp = fnamecmpbuf;
-- }
-+ } else
-+ *fnamecmpbuf = '\0';
-
- if (statret == -1) {
- if (preserve_hard_links && hard_link_check(file, HL_SKIP))
- return;
- if (errno == ENOENT) {
-+ if (f_nameout >= 0)
-+ write(f_nameout, "", 1);
- write_int(f_out,i);
- if (!dry_run)
- write_sum_head(f_out, NULL);
-@@ -471,19 +481,21 @@ static void recv_generator(char *fname,
- /* now pretend the file didn't exist */
- if (preserve_hard_links && hard_link_check(file, HL_SKIP))
- return;
-+ if (f_nameout >= 0)
-+ write(f_nameout, "", 1);
- write_int(f_out,i);
- if (!dry_run)
- write_sum_head(f_out, NULL);
- return;
- }
-
-- if (opt_ignore_existing && fnamecmp == fname) {
-+ if (opt_ignore_existing && !*fnamecmpbuf) {
- if (verbose > 1)
- rprintf(FINFO,"%s exists\n",fname);
- return;
- }
-
-- if (update_only && fnamecmp == fname
-+ if (update_only && !*fnamecmpbuf
- && cmp_modtime(st.st_mtime, file->modtime) > 0) {
- if (verbose > 1)
- rprintf(FINFO,"%s is newer\n",fname);
-@@ -491,17 +503,21 @@ static void recv_generator(char *fname,
- }
-
- if (skip_file(fname, file, &st)) {
-- if (fnamecmp == fname)
-+ if (!*fnamecmpbuf)
- set_perms(fname, file, &st, PERMS_REPORT);
- return;
- }
-
- if (dry_run) {
-+ if (f_nameout >= 0)
-+ write(f_nameout, "", 1);
- write_int(f_out,i);
- return;
- }
-
- if (disable_deltas_p()) {
-+ if (f_nameout >= 0)
-+ write(f_nameout, "", 1);
- write_int(f_out,i);
- write_sum_head(f_out, NULL);
- return;
-@@ -516,6 +532,8 @@ static void recv_generator(char *fname,
- /* pretend the file didn't exist */
- if (preserve_hard_links && hard_link_check(file, HL_SKIP))
- return;
-+ if (f_nameout >= 0)
-+ write(f_nameout, "", 1);
- write_int(f_out,i);
- write_sum_head(f_out, NULL);
- return;
-@@ -534,6 +552,8 @@ static void recv_generator(char *fname,
- if (verbose > 2)
- rprintf(FINFO, "generating and sending sums for %d\n", i);
-
-+ if (f_nameout >= 0)
-+ write(f_nameout, fnamecmpbuf, strlen(fnamecmpbuf) + 1);
- write_int(f_out,i);
- generate_and_send_sums(mapbuf, st.st_size, f_out);
-
-@@ -543,7 +563,8 @@ static void recv_generator(char *fname,
- }
-
-
--void generate_files(int f, struct file_list *flist, char *local_name)
-+void generate_files(int f, struct file_list *flist, char *local_name,
-+ int f_nameout)
- {
- int i;
- int phase = 0;
-@@ -584,7 +605,7 @@ void generate_files(int f, struct file_l
- }
-
- recv_generator(local_name ? local_name : f_name_to(file, fbuf),
-- file, i, f);
-+ file, i, f, f_nameout);
- }
-
- phase++;
-@@ -601,7 +622,7 @@ void generate_files(int f, struct file_l
- while ((i = get_redo_num()) != -1) {
- struct file_struct *file = flist->files[i];
- recv_generator(local_name ? local_name : f_name_to(file, fbuf),
-- file, i, f);
-+ file, i, f, f_nameout);
- }
-
- phase++;
-@@ -620,7 +641,7 @@ void generate_files(int f, struct file_l
- if (!file->basename || !S_ISDIR(file->mode))
- continue;
- recv_generator(local_name ? local_name : f_name(file),
-- file, i, -1);
-+ file, i, -1, -1);
- }
-
- if (verbose > 2)
---- main.c 30 Jun 2004 07:27:30 -0000 1.202
-+++ main.c 30 Jun 2004 07:40:25 -0000
-@@ -429,7 +429,7 @@ static int do_recv(int f_in,int f_out,st
- {
+ fnamecmp = fnamecmpbuf;
+- 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;
+ extern pid_t cleanup_child_pid;
+ extern char *files_from;
+ extern char *remote_filesfrom_file;
+-extern char *compare_dest;
++extern char *compare_dest[];
+ 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
int pid;
int status = 0;
-- int error_pipe[2];
-+ int error_pipe[2], name_pipe[2];
+ 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);
-@@ -441,8 +441,8 @@ static int do_recv(int f_in,int f_out,st
- }
- }
-
-- if (fd_pair(error_pipe) < 0) {
-- rprintf(FERROR,"error pipe failed in do_recv\n");
-+ if (fd_pair(error_pipe) < 0 || fd_pair(name_pipe) < 0) {
-+ rprintf(FERROR, "fd_pair() failed in do_recv\n");
- exit_cleanup(RERR_SOCKETIO);
- }
-
-@@ -450,8 +450,10 @@ static int do_recv(int f_in,int f_out,st
-
- if ((pid = do_fork()) == 0) {
- close(error_pipe[0]);
-+ close(name_pipe[1]);
- if (f_in != f_out)
- close(f_out);
-+ set_blocking(name_pipe[0]);
-
- /* we can't let two processes write to the socket at one time */
- io_multiplexing_close();
-@@ -459,7 +461,7 @@ static int do_recv(int f_in,int f_out,st
- /* set place to send errors */
- set_msg_fd_out(error_pipe[1]);
-
-- recv_files(f_in,flist,local_name);
-+ recv_files(f_in, flist, local_name, name_pipe[0]);
- io_flush(FULL_FLUSH);
- report(f_in);
-
-@@ -475,14 +477,16 @@ static int do_recv(int f_in,int f_out,st
- am_generator = 1;
-
- close(error_pipe[1]);
-+ close(name_pipe[0]);
- if (f_in != f_out)
- close(f_in);
-+ set_blocking(name_pipe[1]);
-
- io_start_buffering_out(f_out);
-
- set_msg_fd_in(error_pipe[0]);
-
-- generate_files(f_out, flist, local_name);
-+ generate_files(f_out, flist, local_name, name_pipe[1]);
-
- get_redo_num(); /* Read final MSG_DONE and any prior messages. */
- report(-1);
---- options.c 20 Jun 2004 19:47:05 -0000 1.157
-+++ options.c 30 Jun 2004 07:40:26 -0000
-@@ -117,7 +117,8 @@ unsigned int backup_dir_remainder;
+--- orig/options.c 2004-07-26 16:43:48
++++ options.c 2004-07-23 22:04:42
+@@ -114,12 +114,13 @@ int write_batch = 0;
+ int read_batch = 0;
+ int backup_dir_len = 0;
+ int backup_suffix_len;
++int num_comp_dest = 0;
+ unsigned int backup_dir_remainder;
char *backup_suffix = NULL;
char *tmpdir = NULL;
+ char *partial_dir = NULL;
-char *compare_dest = NULL;
+char *compare_dest[MAX_COMP_DEST+1];
-+int num_comp_dest = 0;
char *config_file = NULL;
char *shell_cmd = NULL;
char *log_format = NULL;
-@@ -139,6 +140,7 @@ char *batch_prefix = NULL;
+@@ -140,6 +141,7 @@ char *batch_name = NULL;
static int daemon_opt; /* sets am_daemon after option error-reporting */
static int modify_window_set;
/** Local address to bind. As a character string because it's
* interpreted by the IPv6 layer: should be a numeric IP4 or IP6
-@@ -308,7 +310,7 @@ void usage(enum logcode F)
+@@ -317,7 +319,7 @@ void usage(enum logcode F)
}
enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
OPT_REFUSED_BASE = 9000};
-@@ -366,8 +368,8 @@ static struct poptOption long_options[]
+@@ -376,8 +378,8 @@ static struct poptOption long_options[]
{"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 0, 0 },
{"timeout", 0, POPT_ARG_INT, &io_timeout, OPT_TIMEOUT, 0, 0 },
{"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 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 },
-@@ -585,8 +587,36 @@ int parse_arguments(int *argc, const cha
+@@ -594,8 +596,36 @@ int parse_arguments(int *argc, const cha
select_timeout = io_timeout;
break;
link_dest = 1;
break;
#else
-@@ -661,6 +691,11 @@ int parse_arguments(int *argc, const cha
+@@ -693,6 +723,11 @@ int parse_arguments(int *argc, const cha
exit_cleanup(RERR_SYNTAX);
}
if (archive_mode) {
if (!files_from)
recurse = 1;
-@@ -689,8 +724,6 @@ int parse_arguments(int *argc, const cha
- (*argv)[i] = alloc_sanitize_path((*argv)[i], NULL);
- if (tmpdir)
+@@ -723,8 +758,6 @@ int parse_arguments(int *argc, const cha
tmpdir = alloc_sanitize_path(tmpdir, curr_dir);
+ if (partial_dir)
+ partial_dir = alloc_sanitize_path(partial_dir, curr_dir);
- if (compare_dest)
- compare_dest = alloc_sanitize_path(compare_dest, curr_dir);
if (backup_dir)
backup_dir = alloc_sanitize_path(backup_dir, curr_dir);
if (files_from)
-@@ -785,8 +818,8 @@ int parse_arguments(int *argc, const cha
+@@ -836,8 +869,8 @@ int parse_arguments(int *argc, const cha
**/
void server_options(char **args,int *argc)
{
char *arg;
int i, x;
-@@ -968,13 +1001,16 @@ void server_options(char **args,int *arg
+@@ -1018,13 +1051,16 @@ void server_options(char **args,int *arg
args[ac++] = tmpdir;
}
}
if (files_from && (!am_sender || remote_filesfrom_file)) {
---- receiver.c 30 Jun 2004 07:27:30 -0000 1.84
-+++ receiver.c 30 Jun 2004 07:40:26 -0000
-@@ -36,7 +36,6 @@ extern int preserve_perms;
- extern int cvs_exclude;
+--- 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;
extern int io_error;
extern char *tmpdir;
+ extern char *partial_dir;
-extern char *compare_dest;
extern int make_backups;
extern int do_progress;
extern char *backup_dir;
-@@ -293,14 +292,15 @@ static int receive_data(int f_in,struct
- * main routine for receiver process.
- *
- * Receiver process runs on the same host as the generator process. */
--int recv_files(int f_in,struct file_list *flist,char *local_name)
-+int recv_files(int f_in, struct file_list *flist, char *local_name,
-+ int f_name)
- {
- int fd1,fd2;
- STRUCT_STAT st;
- char *fname, fbuf[MAXPATHLEN];
- char template[MAXPATHLEN];
- char fnametmp[MAXPATHLEN];
-- char *fnamecmp;
-+ char *fnamecmp, *cp;
- char fnamecmpbuf[MAXPATHLEN];
- struct map_struct *mapbuf;
- struct file_struct *file;
-@@ -364,19 +364,19 @@ int recv_files(int f_in,struct file_list
- if (verbose > 2)
- rprintf(FINFO,"recv_files(%s)\n",fname);
-
-- fnamecmp = fname;
-+ for (cp = fnamecmpbuf; ; cp++) {
-+ if (read(f_name, cp, 1) <= 0) {
-+ rsyserr(FERROR, errno, "fname-pipe read failed");
-+ exit_cleanup(RERR_PROTOCOL);
-+ }
-+ if (!*cp)
-+ break;
-+ }
-+ fnamecmp = *fnamecmpbuf ? fnamecmpbuf : fname;
-
- /* open the file */
- fd1 = do_open(fnamecmp, O_RDONLY, 0);
-
-- if (fd1 == -1 && compare_dest != NULL) {
-- /* try the file at compare_dest instead */
-- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
-- compare_dest, fname);
-- fnamecmp = fnamecmpbuf;
-- fd1 = do_open(fnamecmp, O_RDONLY, 0);
-- }
--
- if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
- rsyserr(FERROR, errno, "fstat %s failed",
- full_fname(fnamecmp));
-@@ -385,7 +385,7 @@ int recv_files(int f_in,struct file_list
- continue;
- }
-
-- if (fd1 != -1 && S_ISDIR(st.st_mode) && fnamecmp == fname) {
-+ if (fd1 != -1 && S_ISDIR(st.st_mode) && !*fnamecmpbuf) {
- /* this special handling for directories
- * wouldn't be necessary if robust_rename()
- * and the underlying robust_unlink could cope
---- rsync.h 16 May 2004 07:28:24 -0000 1.204
-+++ rsync.h 30 Jun 2004 07:40:26 -0000
+--- orig/rsync.h 2004-07-27 23:23:54
++++ rsync.h 2004-07-03 17:33:30
@@ -98,6 +98,8 @@
#define MAX_ARGS 1000
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff