Updated to apply cleanly.

[rsync/rsync-patches.git] / g2r-basis-filename.diff

diff --git a/g2r-basis-filename.diff b/g2r-basis-filename.diff
index d55aff8..e517191 100644 (file)
--- a/g2r-basis-filename.diff
+++ b/g2r-basis-filename.diff
@@ -7,7 +7,7 @@ support for multiple --compare-dest options).
 
 You must run "make proto" before compiling.
 
---- orig/generator.c   2004-08-03 15:41:32
+--- orig/generator.c   2004-08-05 18:24:21
 +++ generator.c        2004-07-30 07:18:03
 @@ -249,13 +249,13 @@ static void generate_and_send_sums(int f
   * out.  It might be wrong.
@@ -27,7 +27,7 @@ You must run "make proto" before compiling.
  
        if (list_only)
                return;
-@@ -411,6 +411,7 @@ static void recv_generator(char *fname, 
+@@ -417,6 +417,7 @@ static void recv_generator(char *fname, 
        }
  
        fnamecmp = fname;
@@ -35,7 +35,7 @@ You must run "make proto" before compiling.
  
        if (statret == -1 && compare_dest != NULL) {
                /* try the file at compare_dest instead */
-@@ -427,10 +428,14 @@ static void recv_generator(char *fname, 
+@@ -433,10 +434,14 @@ static void recv_generator(char *fname, 
                                                        safe_fname(fname));
                                        }
                                        fnamecmp = fnamecmpbuf;
@@ -50,7 +50,7 @@ You must run "make proto" before compiling.
                        statret = 0;
                }
        }
-@@ -445,11 +450,9 @@ static void recv_generator(char *fname, 
+@@ -451,11 +456,9 @@ static void recv_generator(char *fname, 
        if (statret == -1) {
                if (preserve_hard_links && hard_link_check(file, HL_SKIP))
                        return;
@@ -65,7 +65,7 @@ You must run "make proto" before compiling.
                        rsyserr(FERROR, stat_errno,
                                "recv_generator: failed to stat %s",
                                full_fname(fname));
-@@ -457,13 +460,13 @@ static void recv_generator(char *fname, 
+@@ -463,13 +466,13 @@ static void recv_generator(char *fname, 
                return;
        }
  
@@ -81,7 +81,7 @@ You must run "make proto" before compiling.
            && cmp_modtime(st.st_mtime, file->modtime) > 0) {
                if (verbose > 1)
                        rprintf(FINFO, "%s is newer\n", safe_fname(fname));
-@@ -471,21 +474,17 @@ static void recv_generator(char *fname, 
+@@ -477,21 +480,17 @@ static void recv_generator(char *fname, 
        }
  
        if (skip_file(fnamecmp, file, &st)) {
@@ -109,7 +109,7 @@ You must run "make proto" before compiling.
  
        if (partial_dir) {
                STRUCT_STAT st2;
-@@ -494,6 +493,7 @@ static void recv_generator(char *fname, 
+@@ -500,6 +499,7 @@ static void recv_generator(char *fname, 
                    && S_ISREG(st2.st_mode)) {
                        st = st2;
                        fnamecmp = partialptr;
@@ -117,7 +117,7 @@ You must run "make proto" before compiling.
                }
        }
  
-@@ -506,9 +506,8 @@ static void recv_generator(char *fname, 
+@@ -512,9 +512,8 @@ static void recv_generator(char *fname, 
                /* pretend the file didn't exist */
                if (preserve_hard_links && hard_link_check(file, HL_SKIP))
                        return;
@@ -129,7 +129,7 @@ You must run "make proto" before compiling.
        }
  
        if (verbose > 3) {
-@@ -519,14 +518,28 @@ static void recv_generator(char *fname, 
+@@ -525,14 +524,28 @@ static void recv_generator(char *fname, 
        if (verbose > 2)
                rprintf(FINFO, "generating and sending sums for %d\n", i);
  
@@ -162,7 +162,7 @@ You must run "make proto" before compiling.
  {
        int i;
        int phase = 0;
-@@ -567,7 +580,7 @@ void generate_files(int f_out, struct fi
+@@ -573,7 +586,7 @@ void generate_files(int f_out, struct fi
                }
  
                recv_generator(local_name ? local_name : f_name_to(file, fbuf),
@@ -171,7 +171,7 @@ You must run "make proto" before compiling.
        }
  
        phase++;
-@@ -584,7 +597,7 @@ void generate_files(int f_out, struct fi
+@@ -590,7 +603,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),
@@ -180,7 +180,7 @@ You must run "make proto" before compiling.
        }
  
        phase++;
-@@ -603,7 +616,7 @@ void generate_files(int f_out, struct fi
+@@ -609,7 +622,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),
@@ -189,7 +189,7 @@ You must run "make proto" before compiling.
        }
  
        if (verbose > 2)
---- orig/main.c        2004-07-31 16:41:04
+--- orig/main.c        2004-08-05 18:24:21
 +++ main.c     2004-07-22 00:10:43
 @@ -59,6 +59,7 @@ extern int filesfrom_fd;
  extern pid_t cleanup_child_pid;
@@ -199,7 +199,7 @@ You must run "make proto" before compiling.
  extern char *rsync_path;
  extern char *shell_cmd;
  extern char *batch_name;
-@@ -457,7 +458,8 @@ static int do_recv(int f_in,int f_out,st
+@@ -461,7 +462,8 @@ static int do_recv(int f_in,int f_out,st
  {
        int pid;
        int status = 0;
@@ -209,7 +209,7 @@ You must run "make proto" before compiling.
  
        /* The receiving side mustn't obey this, or an existing symlink that
         * points to an identical file won't be replaced by the referent. */
-@@ -472,8 +474,9 @@ static int do_recv(int f_in,int f_out,st
+@@ -476,8 +478,9 @@ static int do_recv(int f_in,int f_out,st
                        delete_files(flist);
        }
  
@@ -221,7 +221,7 @@ You must run "make proto" before compiling.
                exit_cleanup(RERR_SOCKETIO);
        }
  
-@@ -481,6 +484,11 @@ 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]);
@@ -233,7 +233,7 @@ You must run "make proto" before compiling.
                if (f_in != f_out)
                        close(f_out);
  
-@@ -490,7 +498,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]);
  
@@ -242,7 +242,7 @@ You must run "make proto" before compiling.
                io_flush(FULL_FLUSH);
                report(f_in);
  
-@@ -509,6 +517,11 @@ 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]);
@@ -254,7 +254,7 @@ You must run "make proto" before compiling.
        if (f_in != f_out)
                close(f_in);
  
-@@ -516,7 +529,7 @@ static int do_recv(int f_in,int f_out,st
+@@ -520,7 +533,7 @@ static int do_recv(int f_in,int f_out,st
  
        set_msg_fd_in(error_pipe[0]);