Updated to apply cleanly.

[rsync/rsync-patches.git] / inplace.diff

diff --git a/inplace.diff b/inplace.diff
index 0a262bb..98e4660 100644 (file)
--- a/inplace.diff
+++ b/inplace.diff
@@ -1,7 +1,7 @@
 Patch from Mark Curtis to implement the --inplace option.
 
 --- match.c    21 May 2004 08:27:04 -0000      1.62
-+++ match.c    6 Jun 2004 21:23:27 -0000
++++ match.c    18 Jun 2004 17:27:29 -0000
 @@ -23,6 +23,7 @@ extern int verbose;
  extern int am_server;
  extern int do_progress;
@@ -21,8 +21,8 @@ Patch from Mark Curtis to implement the --inplace option.
                        if (verbose > 3)
                                rprintf(FINFO,"potential match at %.0f target=%.0f %.0f sum=%08x\n",
                                        (double)offset,(double)j,(double)i,sum);
---- options.c  6 Jun 2004 19:02:40 -0000       1.155
-+++ options.c  6 Jun 2004 21:23:27 -0000
+--- options.c  7 Jun 2004 22:05:22 -0000       1.156
++++ options.c  18 Jun 2004 17:27:29 -0000
 @@ -94,6 +94,7 @@ int ignore_errors = 0;
  int modify_window = 0;
  int blocking_io = -1;
@@ -47,7 +47,7 @@ Patch from Mark Curtis to implement the --inplace option.
    {"keep-dirlinks",   'K', POPT_ARG_NONE,   &keep_dirlinks, 0, 0, 0 },
    {"links",           'l', POPT_ARG_NONE,   &preserve_links, 0, 0, 0 },
    {"copy-links",      'L', POPT_ARG_NONE,   &copy_links, 0, 0, 0 },
-@@ -744,6 +747,9 @@ int parse_arguments(int *argc, const cha
+@@ -739,6 +742,9 @@ int parse_arguments(int *argc, const cha
                        bwlimit_writemax = 512;
        }
  
@@ -57,7 +57,7 @@ Patch from Mark Curtis to implement the --inplace option.
        if (files_from) {
                char *colon;
                if (*argc != 2 && !(am_server && am_sender && *argc == 1)) {
-@@ -968,6 +974,9 @@ void server_options(char **args,int *arg
+@@ -963,6 +969,9 @@ void server_options(char **args,int *arg
        if (opt_ignore_existing && am_sender)
                args[ac++] = "--ignore-existing";
  
@@ -67,9 +67,9 @@ Patch from Mark Curtis to implement the --inplace option.
        if (tmpdir) {
                args[ac++] = "--temp-dir";
                args[ac++] = tmpdir;
---- receiver.c 21 May 2004 08:27:04 -0000      1.79
-+++ receiver.c 6 Jun 2004 21:23:27 -0000
-@@ -47,6 +47,7 @@ extern int ignore_errors;
+--- receiver.c 14 Jun 2004 15:09:36 -0000      1.82
++++ receiver.c 18 Jun 2004 17:27:30 -0000
+@@ -48,6 +48,7 @@ extern int ignore_errors;
  extern int orig_umask;
  extern int keep_partial;
  extern int checksum_seed;
@@ -77,7 +77,7 @@ Patch from Mark Curtis to implement the --inplace option.
  
  static void delete_one(char *fn, int is_dir)
  {
-@@ -252,16 +253,28 @@ static int receive_data(int f_in,struct 
+@@ -257,16 +258,28 @@ static int receive_data(int f_in,struct 
                        sum_update(map,len);
                }
  
@@ -110,7 +110,7 @@ Patch from Mark Curtis to implement the --inplace option.
        if (do_progress)
                end_progress(total_size);
  
-@@ -413,37 +426,50 @@ int recv_files(int f_in,struct file_list
+@@ -418,37 +431,50 @@ int recv_files(int f_in,struct file_list
                } else
                        mapbuf = NULL;
  
@@ -189,8 +189,8 @@ Patch from Mark Curtis to implement the --inplace option.
                }
  
                cleanup_set(fnametmp, fname, file, mapbuf, fd1, fd2);
---- rsync.c    21 May 2004 08:43:03 -0000      1.140
-+++ rsync.c    6 Jun 2004 21:23:27 -0000
+--- rsync.c    11 Jun 2004 07:40:45 -0000      1.141
++++ rsync.c    18 Jun 2004 17:27:30 -0000
 @@ -34,6 +34,7 @@ extern int force_delete;
  extern int recurse;
  extern int make_backups;
@@ -212,7 +212,7 @@ Patch from Mark Curtis to implement the --inplace option.
        ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
        if (ret < 0) {
 --- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171
-+++ rsync.yo   6 Jun 2004 21:23:28 -0000
++++ rsync.yo   18 Jun 2004 17:27:30 -0000
 @@ -289,6 +289,7 @@ verb(
       --backup-dir            make backups into this directory
       --suffix=SUFFIX         backup suffix (default ~ w/o --backup-dir)