Updated to apply cleanly to latest CVS source.

[rsync/rsync-patches.git] / early-chmod.diff

diff --git a/early-chmod.diff b/early-chmod.diff
index 897b291..731a43e 100644 (file)
--- a/early-chmod.diff
+++ b/early-chmod.diff
@@ -1,5 +1,5 @@
---- rsync.c    13 Mar 2004 20:18:03 -0000      1.134
-+++ rsync.c    13 Mar 2004 20:19:40 -0000
+--- rsync.c    23 Mar 2004 16:16:15 -0000      1.135
++++ rsync.c    15 Apr 2004 19:14:12 -0000
 @@ -235,6 +235,9 @@ void finish_transfer(char *fname, char *
        if (make_backups && !make_backup(fname))
                return;
@@ -22,8 +22,8 @@
        }
  }
  
---- t_stub.c   11 Sep 2003 04:48:13 -0000      1.4
-+++ t_stub.c   13 Mar 2004 20:19:40 -0000
+--- t_stub.c   14 Apr 2004 23:33:34 -0000      1.6
++++ t_stub.c   15 Apr 2004 19:14:12 -0000
 @@ -26,6 +26,7 @@
   * functions, so that module test harnesses can run standalone.
   **/
@@ -31,18 +31,18 @@
 +int am_root = 0;
  int modify_window = 0;
  int module_id = -1;
- struct exclude_struct **server_exclude_list;
---- util.c     17 Feb 2004 23:13:10 -0000      1.132
-+++ util.c     13 Mar 2004 20:19:40 -0000
+ struct exclude_list_struct server_exclude_list;
+--- util.c     14 Apr 2004 23:33:34 -0000      1.135
++++ util.c     15 Apr 2004 19:14:13 -0000
 @@ -28,6 +28,7 @@
  #include "rsync.h"
  
  extern int verbose;
 +extern int am_root;
+ extern struct exclude_list_struct server_exclude_list;
  
  int sanitize_paths = 0;
- 
-@@ -262,6 +263,8 @@ int copy_file(char *source, char *dest, 
+@@ -263,6 +264,8 @@ int copy_file(char *source, char *dest, 
                return -1;
        }
  
@@ -51,7 +51,7 @@
        ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode);
        if (ofd == -1) {
                rprintf(FERROR,"open %s: %s\n",
-@@ -353,8 +356,8 @@ int robust_unlink(char *fname)
+@@ -354,8 +357,8 @@ int robust_unlink(char *fname)
  #endif
  }
  
@@ -62,7 +62,7 @@
  int robust_rename(char *from, char *to, int mode)
  {
        int tries = 4;
-@@ -371,10 +374,12 @@ int robust_rename(char *from, char *to, 
+@@ -372,10 +375,12 @@ int robust_rename(char *from, char *to, 
                        break;
  #endif
                case EXDEV: