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-09-20 19:50:13
++++ generator.c 2004-09-20 19:57:58
+@@ -254,14 +254,15 @@ 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;
- 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);
+- int fd, f_copy;
++ int fd = -1, f_copy;
+ STRUCT_STAT st, partial_st;
+ struct file_struct *back_file;
+ int statret, stat_errno;
+ char *fnamecmp, *partialptr, *backupptr;
+ char fnamecmpbuf[MAXPATHLEN];
++ uchar fnamecmp_type;
+
+ if (list_only)
+ return;
+@@ -423,6 +424,7 @@ static void recv_generator(char *fname,
+ }
+
+ fnamecmp = fname;
++ fnamecmp_type = G2R_FNAME;
+
+ if (statret == -1 && compare_dest != NULL) {
+ /* try the file at compare_dest instead */
+@@ -439,10 +441,14 @@ static void recv_generator(char *fname,
+ safe_fname(fname));
+ }
+ fnamecmp = fnamecmpbuf;
++ fnamecmp_type = 0;
}
-- }
-- fnamecmp = fnamecmpbuf;
-+ fnamecmp = fnamecmpbuf;
-+ } else
-+ *fnamecmpbuf = '\0';
- }
+ } else
#endif
- else
- fnamecmp = fnamecmpbuf;
-- }
-+ } else
-+ *fnamecmpbuf = '\0';
-
++ {
+ fnamecmp = fnamecmpbuf;
++ fnamecmp_type = 0;
++ }
+ statret = 0;
+ }
+ }
+@@ -465,11 +471,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));
+@@ -477,13 +481,13 @@ static void recv_generator(char *fname,
return;
}
- if (opt_ignore_existing && fnamecmp == fname) {
-+ if (opt_ignore_existing && !*fnamecmpbuf) {
++ if (opt_ignore_existing && fnamecmp_type == G2R_FNAME) {
if (verbose > 1)
- rprintf(FINFO,"%s exists\n",fname);
+ rprintf(FINFO, "%s exists\n", safe_fname(fname));
return;
}
- if (update_only && fnamecmp == fname
-+ if (update_only && !*fnamecmpbuf
++ if (update_only && fnamecmp_type == G2R_FNAME
&& 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));
+@@ -491,26 +495,23 @@ static void recv_generator(char *fname,
}
- if (skip_file(fname, file, &st)) {
+ if (skip_file(fnamecmp, file, &st)) {
- if (fnamecmp == fname)
-+ if (!*fnamecmpbuf)
++ if (fnamecmp_type == G2R_FNAME)
set_perms(fname, file, &st, PERMS_REPORT);
return;
}
- if (dry_run) {
-+ if (f_nameout >= 0)
-+ write_byte(f_nameout, 0);
- write_int(f_out,i);
- return;
+ prepare_to_open:
+- 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 > 0) {
++ 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 (partialptr) {
+ st = partial_st;
+ fnamecmp = partialptr;
++ fnamecmp_type = G2R_PARTIAL_DIR;
+ }
+
+ /* open the file */
+@@ -523,9 +524,8 @@ prepare_to_open:
/* 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 (inplace && make_backups) {
+@@ -552,6 +552,7 @@ prepare_to_open:
+ close(fd);
+ return;
+ }
++ fnamecmp_type = G2R_BACKUP;
+ } else {
+ backupptr = NULL;
+ back_file = NULL;
+@@ -566,22 +567,38 @@ prepare_to_open:
if (verbose > 2)
rprintf(FINFO, "generating and sending sums for %d\n", i);
-+ if (f_nameout >= 0) {
-+ uchar lenbuf[3], *lb = lenbuf;
-+ int len = strlen(fnamecmpbuf);
-+ if (len > 127) {
-+#if MAXPATHLEN > 32767
-+ *lb++ = len / 0x10000 + 0x80;
-+ *lb++ = len / 0x100;
-+#else
-+ *lb++ = len / 0x100 + 0x80;
-+#endif
+- write_int(f_out,i);
+- generate_and_send_sums(fd, st.st_size, f_out, f_copy);
+-
+- if (f_copy >= 0) {
+- close(f_copy);
+- set_perms(backupptr, back_file, NULL, 0);
+- if (verbose > 1)
+- rprintf(FINFO, "backed up %s to %s\n", fname, backupptr);
+- free(back_file);
++notify_others:
++ if (f_out_name >= 0) {
++ write_byte(f_out_name, fnamecmp_type);
++ io_flush(NORMAL_FLUSH); /* XXX make this more efficient! */
+ }
+
+- close(fd);
++ write_int(f_out, i);
++
++ if (dry_run || read_batch)
++ return;
++
++ if (statret == 0) {
++ generate_and_send_sums(fd, st.st_size, f_out, f_copy);
++
++ if (f_copy >= 0) {
++ close(f_copy);
++ set_perms(backupptr, back_file, NULL, 0);
++ if (verbose > 1) {
++ rprintf(FINFO, "backed up %s to %s\n",
++ fname, backupptr);
++ }
++ free(back_file);
+ }
-+ *lb = len;
-+ write_buf(f_nameout, lenbuf, lb - lenbuf + 1);
-+ write_buf(f_nameout, fnamecmpbuf, len);
-+ }
+
- write_int(f_out,i);
- generate_and_send_sums(mapbuf, st.st_size, f_out);
-
-@@ -530,7 +560,8 @@ static void recv_generator(char *fname,
++ 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
+@@ -622,7 +639,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
+@@ -639,7 +656,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
+@@ -658,7 +675,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-09-18 01:49:33
++++ main.c 2004-07-22 00:10:43
+@@ -59,6 +59,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;
+@@ -461,7 +462,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
- }
+ /* The receiving side mustn't obey this, or an existing symlink that
+ * points to an identical file won't be replaced by the referent. */
+@@ -476,8 +478,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
+@@ -485,6 +488,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
+@@ -494,7 +502,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
+@@ -513,6 +521,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();
+@@ -520,7 +533,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-09-21 09:40:27
++++ receiver.c 2004-09-07 21:57:20
+@@ -329,7 +329,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;
+@@ -358,8 +359,13 @@ 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) {}
++ if (next_gen_i != flist->count) {
++ do {
++ if (f_in_name >= 0
++ && next_gen_i >= 0)
++ read_byte(f_in_name);
++ } while (read_int(batch_gen_fd) != -1);
++ }
+ 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
+@@ -407,6 +413,8 @@ 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_byte(f_in_name);
+ next_gen_i = read_int(batch_gen_fd);
+ if (next_gen_i == -1)
+ next_gen_i = flist->count;
+@@ -417,6 +425,7 @@ int recv_files(int f_in, struct file_lis
+ discard_receive_data(f_in, file->length);
+ continue;
+ }
++ next_gen_i = -1;
+ }
+
+ if (server_exclude_list.head
+@@ -426,35 +435,31 @@ int recv_files(int f_in, struct file_lis
+ exit_cleanup(RERR_PROTOCOL);
+ }
+
+- if (partial_dir) {
+- if ((partialptr = partial_dir_fname(fname)) != NULL)
+- fnamecmp = partialptr;
+- else
++ partialptr = partial_dir ? partial_dir_fname(fname) : fname;
++
++ if (f_in_name >= 0) {
++ switch (read_byte(f_in_name)) {
++ case G2R_FNAME:
+ fnamecmp = fname;
++ break;
++ case G2R_PARTIAL_DIR:
++ fnamecmp = partialptr ? partialptr : fname;
++ break;
++ case G2R_BACKUP:
++ fnamecmp = get_backup_name(fname);
++ break;
++ default:
++ pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
++ compare_dest, fname);
++ fnamecmp = fnamecmpbuf;
++ break;
++ }
+ } else
+- fnamecmp = partialptr = fname;
+-
+- if (inplace && make_backups) {
+- if (!(fnamecmp = get_backup_name(fname)))
+- fnamecmp = partialptr;
+- }
+ fnamecmp = fname;
/* open the file */
fd1 = do_open(fnamecmp, O_RDONLY, 0);
+- if (fd1 == -1 && fnamecmp != fname) {
+- fnamecmp = fname;
+- fd1 = do_open(fnamecmp, O_RDONLY, 0);
+- }
+-
- if (fd1 == -1 && compare_dest != NULL) {
- /* try the file at compare_dest instead */
- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
rsyserr(FERROR, errno, "fstat %s failed",
full_fname(fnamecmp));
+--- orig/rsync.h 2004-09-22 08:47:31
++++ rsync.h 2004-09-07 21:52:22
+@@ -119,6 +119,10 @@
+ #define PDIR_CREATE 1
+ #define PDIR_DELETE 0
+
++#define G2R_FNAME 0x80
++#define G2R_PARTIAL_DIR 0x81
++#define G2R_BACKUP 0x82
++
+
+ /* Log-message categories. FLOG is only used on the daemon side to
+ * output messages to the log file. */