Fixed failed hunks.

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

diff --git a/inplace.diff b/inplace.diff
index 0ba548d..ba8e3ed 100644 (file)
--- a/inplace.diff
+++ b/inplace.diff
@@ -1,7 +1,7 @@
 Patch from Mark Curtis to implement the --inplace option.
 
---- match.c    3 Jan 2004 19:28:03 -0000       1.60
-+++ match.c    8 May 2004 18:38:33 -0000
+--- match.c    13 May 2004 06:46:20 -0000      1.61
++++ match.c    13 May 2004 19:02:25 -0000
 @@ -22,6 +22,7 @@
  extern int verbose;
  extern int am_server;
@@ -22,7 +22,7 @@ Patch from Mark Curtis to implement the --inplace option.
  
                        if (verbose > 3)
 --- options.c  6 May 2004 21:08:01 -0000       1.148
-+++ options.c  8 May 2004 18:38:33 -0000
++++ options.c  13 May 2004 19:02:25 -0000
 @@ -91,6 +91,7 @@ int ignore_errors = 0;
  int modify_window = 0;
  int blocking_io = -1;
@@ -67,17 +67,17 @@ Patch from Mark Curtis to implement the --inplace option.
  
        if (tmpdir) {
                args[ac++] = "--temp-dir";
---- receiver.c 27 Apr 2004 19:51:33 -0000      1.76
-+++ receiver.c 8 May 2004 18:38:33 -0000
-@@ -45,6 +45,7 @@ extern int cleanup_got_literal;
- extern int module_id;
+--- receiver.c 13 May 2004 07:08:22 -0000      1.77
++++ receiver.c 13 May 2004 19:02:25 -0000
+@@ -46,6 +46,7 @@ extern int module_id;
  extern int ignore_errors;
  extern int orig_umask;
+ extern int keep_partial;
 +extern int inplace;
  
  static void delete_one(char *fn, int is_dir)
  {
-@@ -249,16 +250,28 @@ static int receive_data(int f_in,struct 
+@@ -250,16 +251,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);
  
-@@ -410,37 +423,50 @@ int recv_files(int f_in,struct file_list
+@@ -411,37 +424,50 @@ int recv_files(int f_in,struct file_list
                } else
                        mapbuf = NULL;
  
@@ -189,17 +189,17 @@ Patch from Mark Curtis to implement the --inplace option.
                }
  
                cleanup_set(fnametmp, fname, file, mapbuf, fd1, fd2);
---- rsync.c    23 Mar 2004 16:16:15 -0000      1.135
-+++ rsync.c    8 May 2004 18:38:33 -0000
-@@ -33,6 +33,7 @@ extern int preserve_uid;
+--- rsync.c    13 May 2004 18:51:22 -0000      1.138
++++ rsync.c    13 May 2004 19:02:25 -0000
+@@ -31,6 +31,7 @@ extern int am_generator;
+ extern int preserve_uid;
  extern int preserve_gid;
- extern int preserve_perms;
  extern int make_backups;
 +extern int inplace;
  
  
  /*
-@@ -234,6 +235,11 @@ void finish_transfer(char *fname, char *
+@@ -235,6 +236,11 @@ void finish_transfer(char *fname, char *
  
        if (make_backups && !make_backup(fname))
                return;
@@ -212,7 +212,7 @@ Patch from Mark Curtis to implement the --inplace option.
        /* move tmp file over real file */
        ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
 --- rsync.yo   7 May 2004 00:18:37 -0000       1.169
-+++ rsync.yo   8 May 2004 18:38:34 -0000
++++ rsync.yo   13 May 2004 19:02:26 -0000
 @@ -289,6 +289,7 @@ verb(
       --backup-dir            make backups into this directory
       --suffix=SUFFIX         backup suffix (default ~ w/o --backup-dir)