+Depends-On-Patch: partial-dir.diff
+
Added a pipe from the generator to the receiver that communicates
what basis file we used to generate the file data (if it was not
the default name). This optimizes away the basis-file search in
You must run "make proto" before compiling.
---- orig/generator.c 2004-07-17 15:20:05
-+++ generator.c 2004-07-17 10:23:13
-@@ -251,7 +251,7 @@ static void generate_and_send_sums(struc
+--- orig/generator.c 2004-07-28 09:58:28
++++ generator.c 2004-07-28 10:14:15
+@@ -259,9 +259,9 @@ static void generate_and_send_sums(int f
* 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 f_out, int f_out_name)
{
- int fd;
+- int fd;
++ int fd = -1;
STRUCT_STAT st;
-@@ -418,8 +418,10 @@ static void recv_generator(char *fname,
- statret = link_stat(fnamecmpbuf, &st, 0);
- if (!S_ISREG(st.st_mode))
- statret = -1;
-- if (statret == -1)
-+ if (statret < 0) {
- errno = saveerrno;
-+ *fnamecmpbuf = '\0';
-+ }
- #if HAVE_LINK
- else if (link_dest && !dry_run) {
- if (do_link(fnamecmpbuf, fname) != 0) {
-@@ -427,18 +429,22 @@ static void recv_generator(char *fname,
- rsyserr(FINFO, errno, "link %s => %s",
- fnamecmpbuf, fname);
- }
-- }
-- fnamecmp = fnamecmpbuf;
-+ fnamecmp = fnamecmpbuf;
-+ } else
-+ *fnamecmpbuf = '\0';
- }
+ int statret, stat_errno;
+ char *fnamecmp;
+@@ -437,13 +437,16 @@ static void recv_generator(char *fname,
+ safe_fname(fname));
+ }
+ fnamecmp = fnamecmpbuf;
+- }
++ } else
++ *fnamecmpbuf = '\0';
+ } else
#endif
- else
- fnamecmp = fnamecmpbuf;
+ fnamecmp = fnamecmpbuf;
+ statret = 0;
+- }
- }
++ } else
++ *fnamecmpbuf = '\0';
+ } else
+ *fnamecmpbuf = '\0';
+ if (statret == 0 && !S_ISREG(st.st_mode)) {
+ if (delete_file(fname) != 0)
+@@ -455,11 +458,9 @@ static void recv_generator(char *fname,
if (statret == -1) {
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
- if (errno == ENOENT) {
-+ if (f_nameout >= 0)
-+ write_byte(f_nameout, 0);
- write_int(f_out,i);
- if (!dry_run)
- write_sum_head(f_out, NULL);
-@@ -458,19 +464,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_byte(f_nameout, 0);
- write_int(f_out,i);
- if (!dry_run)
- write_sum_head(f_out, NULL);
+- if (stat_errno == ENOENT) {
+- write_int(f_out,i);
+- if (!dry_run && !read_batch)
+- write_sum_head(f_out, NULL);
+- } else if (verbose > 1) {
++ if (stat_errno == ENOENT)
++ goto notify_others;
++ if (verbose > 1) {
+ rsyserr(FERROR, stat_errno,
+ "recv_generator: failed to stat %s",
+ full_fname(fname));
+@@ -467,13 +468,13 @@ static void recv_generator(char *fname,
return;
}
- if (opt_ignore_existing && fnamecmp == fname) {
+ if (opt_ignore_existing && !*fnamecmpbuf) {
if (verbose > 1)
- rprintf(FINFO,"%s exists\n",fname);
+ rprintf(FINFO, "%s exists\n", safe_fname(fname));
return;
}
+ if (update_only && !*fnamecmpbuf
&& cmp_modtime(st.st_mtime, file->modtime) > 0) {
if (verbose > 1)
- rprintf(FINFO,"%s is newer\n",fname);
-@@ -478,17 +486,21 @@ static void recv_generator(char *fname,
+ rprintf(FINFO, "%s is newer\n", safe_fname(fname));
+@@ -481,21 +482,17 @@ static void recv_generator(char *fname,
}
if (skip_file(fname, file, &st)) {
return;
}
- if (dry_run) {
-+ if (f_nameout >= 0)
-+ write_byte(f_nameout, 0);
- write_int(f_out,i);
- return;
+- if (dry_run || read_batch) {
+- write_int(f_out,i);
+- return;
+- }
+-
+- if (whole_file > 0) {
+- write_int(f_out,i);
+- write_sum_head(f_out, NULL);
+- return;
++ if (dry_run || whole_file) {
++ statret = -1;
++ goto notify_others;
}
++ if (read_batch)
++ goto notify_others;
- if (whole_file > 0) {
-+ if (f_nameout >= 0)
-+ write_byte(f_nameout, 0);
- write_int(f_out,i);
- write_sum_head(f_out, NULL);
- return;
-@@ -503,6 +515,8 @@ static void recv_generator(char *fname,
+ if (partial_dir) {
+ STRUCT_STAT st2;
+@@ -516,9 +513,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_byte(f_nameout, 0);
- write_int(f_out,i);
- write_sum_head(f_out, NULL);
- return;
-@@ -521,6 +535,22 @@ static void recv_generator(char *fname,
+- write_int(f_out,i);
+- write_sum_head(f_out, NULL);
+- return;
++ statret = -1;
++ goto notify_others;
+ }
+
+ if (verbose > 3) {
+@@ -529,14 +525,41 @@ static void recv_generator(char *fname,
if (verbose > 2)
rprintf(FINFO, "generating and sending sums for %d\n", i);
-+ if (f_nameout >= 0) {
+- write_int(f_out,i);
+- generate_and_send_sums(fd, st.st_size, f_out);
++notify_others:
++ if (f_out_name >= 0) {
+ uchar lenbuf[3], *lb = lenbuf;
-+ int len = strlen(fnamecmpbuf);
-+ if (len > 127) {
-+#if MAXPATHLEN > 32767
-+ *lb++ = len / 0x10000 + 0x80;
-+ *lb++ = len / 0x100;
++ int len = statret == -1 ? 0 : strlen(fnamecmpbuf);
++ if (len > 0x7F) {
++#if MAXPATHLEN > 0x7FFF
++ *lb++ = len / 0x10000 + 0x80;
++ *lb++ = len / 0x100;
+#else
-+ *lb++ = len / 0x100 + 0x80;
++ *lb++ = len / 0x100 + 0x80;
+#endif
+ }
+ *lb = len;
-+ write_buf(f_nameout, lenbuf, lb - lenbuf + 1);
-+ write_buf(f_nameout, fnamecmpbuf, len);
++ write_buf(f_out_name, lenbuf, lb - lenbuf + 1);
++ if (len)
++ write_buf(f_out_name, fnamecmpbuf, len);
++ io_flush(NORMAL_FLUSH); /* XXX make this more efficient! */
+ }
+
- write_int(f_out,i);
- generate_and_send_sums(mapbuf, st.st_size, f_out);
++ write_int(f_out, i);
++
++ if (dry_run || read_batch)
++ return;
-@@ -530,7 +560,8 @@ static void recv_generator(char *fname,
+- close(fd);
++ if (statret == 0) {
++ generate_and_send_sums(fd, st.st_size, f_out);
++
++ close(fd);
++ } else
++ write_sum_head(f_out, NULL);
}
-void generate_files(int f_out, struct file_list *flist, char *local_name)
+void generate_files(int f_out, struct file_list *flist, char *local_name,
-+ int f_nameout)
++ int f_out_name)
{
int i;
int phase = 0;
-@@ -571,7 +602,7 @@ void generate_files(int f_out, struct fi
+@@ -577,7 +600,7 @@ void generate_files(int f_out, struct fi
}
recv_generator(local_name ? local_name : f_name_to(file, fbuf),
- file, i, f_out);
-+ file, i, f_out, f_nameout);
++ file, i, f_out, f_out_name);
}
phase++;
-@@ -588,7 +619,7 @@ void generate_files(int f_out, struct fi
+@@ -594,7 +617,7 @@ void generate_files(int f_out, struct fi
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_out);
-+ file, i, f_out, f_nameout);
++ file, i, f_out, f_out_name);
}
phase++;
-@@ -607,7 +638,7 @@ void generate_files(int f_out, struct fi
+@@ -613,7 +636,7 @@ void generate_files(int f_out, struct fi
if (!file->basename || !S_ISDIR(file->mode))
continue;
recv_generator(local_name ? local_name : f_name(file),
}
if (verbose > 2)
---- orig/main.c 2004-07-17 15:20:05
-+++ main.c 2004-07-17 15:22:08
-@@ -444,7 +444,7 @@ static int do_recv(int f_in,int f_out,st
+--- orig/main.c 2004-07-24 16:52:09
++++ main.c 2004-07-22 00:10:43
+@@ -58,6 +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 *rsync_path;
+ extern char *shell_cmd;
+ extern char *batch_name;
+@@ -456,7 +457,8 @@ 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];
++ BOOL need_name_pipe = compare_dest && !dry_run;
if (preserve_hard_links)
init_hard_links(flist);
-@@ -456,8 +456,8 @@ static int do_recv(int f_in,int f_out,st
- }
+@@ -467,8 +469,9 @@ static int do_recv(int f_in,int f_out,st
+ delete_files(flist);
}
- 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) {
++ if (fd_pair(error_pipe) < 0
++ || (need_name_pipe && fd_pair(name_pipe) < 0)) {
+ rprintf(FERROR, "fd_pair() failed in do_recv\n");
exit_cleanup(RERR_SOCKETIO);
}
-@@ -465,8 +465,10 @@ static int do_recv(int f_in,int f_out,st
+@@ -476,6 +479,11 @@ 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 (need_name_pipe) {
++ close(name_pipe[1]);
++ set_blocking(name_pipe[0]);
++ } else
++ name_pipe[0] = -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();
-@@ -474,7 +476,7 @@ static int do_recv(int f_in,int f_out,st
+@@ -485,7 +493,7 @@ static int do_recv(int f_in,int f_out,st
/* set place to send errors */
set_msg_fd_out(error_pipe[1]);
io_flush(FULL_FLUSH);
report(f_in);
-@@ -492,14 +494,16 @@ static int do_recv(int f_in,int f_out,st
+@@ -503,6 +511,11 @@ static int do_recv(int f_in,int f_out,st
stop_write_batch();
close(error_pipe[1]);
-+ close(name_pipe[0]);
++ if (need_name_pipe) {
++ close(name_pipe[0]);
++ set_nonblocking(name_pipe[1]);
++ } else
++ name_pipe[1] = -1;
if (f_in != f_out)
close(f_in);
-+ set_nonblocking(name_pipe[1]);
- io_start_buffering_out();
+@@ -510,7 +523,7 @@ static int do_recv(int f_in,int f_out,st
set_msg_fd_in(error_pipe[0]);
get_redo_num(); /* Read final MSG_DONE and any prior messages. */
report(-1);
---- orig/receiver.c 2004-07-16 20:07:22
-+++ receiver.c 2004-07-17 11:05:36
-@@ -304,7 +304,8 @@ static int receive_data(int f_in,struct
+--- orig/receiver.c 2004-07-27 23:26:20
++++ receiver.c 2004-07-23 21:59:07
+@@ -325,6 +325,30 @@ static int receive_data(int f_in, char *
+ }
+
+
++static char *read_gen_name(int fd, char *buf, char *realname)
++{
++ int len = read_byte(fd);
++ if (len & 0x80) {
++#if MAXPATHLEN > 32767
++ uchar lenbuf[2];
++ read_buf(fd, (char *)lenbuf, 2);
++ len = (len & ~0x80) * 0x10000 + lenbuf[0] * 0x100 + lenbuf[1];
++#else
++ len = (len & ~0x80) * 0x100 + read_byte(fd);
++#endif
++ }
++ if (len) {
++ if (len >= MAXPATHLEN) {
++ rprintf(FERROR, "bogus data on generator name pipe\n");
++ exit_cleanup(RERR_PROTOCOL);
++ }
++ read_sbuf(fd, buf, len);
++ return buf;
++ }
++ return realname;
++}
++
++
+ static void discard_receive_data(int f_in, OFF_T length)
+ {
+ receive_data(f_in, NULL, -1, 0, NULL, -1, length);
+@@ -335,7 +359,8 @@ static void discard_receive_data(int f_i
* 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 f_in_name)
{
+ int next_gen_i = -1;
int fd1,fd2;
- STRUCT_STAT st;
-@@ -317,7 +318,7 @@ int recv_files(int f_in, struct file_lis
- struct file_struct *file;
- struct stats initial_stats;
- int save_make_backups = make_backups;
-- int i, recv_ok, phase = 0;
-+ int i, len, recv_ok, phase = 0;
+@@ -364,8 +389,15 @@ int recv_files(int f_in, struct file_lis
+ i = read_int(f_in);
+ if (i == -1) {
+ if (read_batch) {
+- if (next_gen_i != flist->count)
+- while (read_int(batch_gen_fd) != -1) {}
++ while (next_gen_i < flist->count) {
++ if (f_in_name >= 0 && next_gen_i >= 0) {
++ read_gen_name(f_in_name,
++ fnamecmpbuf, NULL);
++ }
++ next_gen_i = read_int(batch_gen_fd);
++ if (next_gen_i < 0)
++ break;
++ }
+ next_gen_i = -1;
+ }
- if (verbose > 2)
- rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
-@@ -373,19 +374,25 @@ int recv_files(int f_in, struct file_lis
- if (verbose > 2)
- rprintf(FINFO,"recv_files(%s)\n",fname);
-
-- fnamecmp = fname;
-+ len = read_byte(f_name);
-+ if (len & 0x80) {
-+#if MAXPATHLEN > 32767
-+ read_buf(f_name, fnamecmpbuf, 2);
-+ len = (len & ~0x80) * 0x10000
-+ + fnamecmpbuf[0] * 0x100 + fnamecmpbuf[1];
-+#else
-+ len = (len & ~0x80) * 0x100 + read_byte(f_name);
-+#endif
-+ }
-+ if (len) {
-+ read_sbuf(f_name, fnamecmpbuf, len);
-+ fnamecmp = fnamecmpbuf;
-+ } else
+@@ -413,6 +445,10 @@ int recv_files(int f_in, struct file_lis
+
+ if (read_batch) {
+ while (i > next_gen_i) {
++ if (f_in_name >= 0 && next_gen_i >= 0) {
++ read_gen_name(f_in_name, fnamecmpbuf,
++ NULL);
++ }
+ next_gen_i = read_int(batch_gen_fd);
+ if (next_gen_i == -1)
+ next_gen_i = flist->count;
+@@ -423,8 +459,14 @@ int recv_files(int f_in, struct file_lis
+ discard_receive_data(f_in, file->length);
+ continue;
+ }
++ next_gen_i = -1;
+ }
+
++ if (f_in_name >= 0)
++ fnamecmp = read_gen_name(f_in_name, fnamecmpbuf, fname);
++ else
+ fnamecmp = fname;
++
+ if (server_exclude_list.head
+ && check_exclude(&server_exclude_list, fname,
+ S_ISDIR(file->mode)) < 0) {
+@@ -437,13 +479,7 @@ int recv_files(int f_in, struct file_lis
+ continue;
+ }
+
+- if (partial_dir) {
+- if ((partialptr = partial_dir_fname(fname)) != NULL)
+- fnamecmp = partialptr;
+- else
+- fnamecmp = fname;
+- } else
+- fnamecmp = partialptr = fname;
++ partialptr = partial_dir ? partial_dir_fname(fname) : fname;
/* open the file */
fd1 = do_open(fnamecmp, O_RDONLY, 0);
+@@ -453,14 +489,6 @@ int recv_files(int f_in, struct file_lis
+ fd1 = do_open(fnamecmp, O_RDONLY, 0);
+ }
- if (fd1 == -1 && compare_dest != NULL) {
- /* try the file at compare_dest instead */
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff