-+ *fnamecmpbuf = '\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';
- }
- #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
- {
- int pid;
- int status = 0;
-- int error_pipe[2];
-+ int error_pipe[2], name_pipe[2];
-
- 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
Matt McCutchen's Web Site / rsync / rsync-patches.git / commitdiff