Tweaked to work with latest CVS.

diff --git a/early-chmod.diff b/early-chmod.diff
index e3778e7..897b291 100644 (file)
--- a/early-chmod.diff
+++ b/early-chmod.diff
@@ -1,19 +1,6 @@
---- backup.c   23 Feb 2004 07:03:03 -0000      1.27
-+++ backup.c   6 Mar 2004 07:46:00 -0000
-@@ -130,8 +130,8 @@ failure:
- /* robustly move a file, creating new directory structures if necessary */
- static int robust_move(char *src, char *dst)
- {
--      if (robust_rename(src, dst, 0755) != 0 && (errno != ENOENT
--          || make_bak_dir(dst) < 0 || robust_rename(src, dst, 0755) != 0))
-+      if (robust_rename(src, dst, 0755) < 0 && (errno != ENOENT
-+          || make_bak_dir(dst) < 0 || robust_rename(src, dst, 0755) < 0))
-               return -1;
-       return 0;
- }
---- rsync.c    25 Feb 2004 21:20:59 -0000      1.133
-+++ rsync.c    6 Mar 2004 07:46:00 -0000
-@@ -235,15 +235,19 @@ void finish_transfer(char *fname, char *
+--- rsync.c    13 Mar 2004 20:18:03 -0000      1.134
++++ rsync.c    13 Mar 2004 20:19:40 -0000
+@@ -235,6 +235,9 @@ void finish_transfer(char *fname, char *
        if (make_backups && !make_backup(fname))
                return;
  
@@ -22,9 +9,8 @@
 +
        /* move tmp file over real file */
        ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
--      if (ret != 0) {
-+      if (ret < 0) {
-               rprintf(FERROR, "%s %s -> \"%s\": %s\n",
+       if (ret < 0) {
+@@ -242,8 +245,9 @@ void finish_transfer(char *fname, char *
                    ret == -2 ? "copy" : "rename",
                    full_fname(fnametmp), fname, strerror(errno));
                do_unlink(fnametmp);
@@ -37,7 +23,7 @@
  }
  
 --- t_stub.c   11 Sep 2003 04:48:13 -0000      1.4
-+++ t_stub.c   6 Mar 2004 07:46:00 -0000
++++ t_stub.c   13 Mar 2004 20:19:40 -0000
 @@ -26,6 +26,7 @@
   * functions, so that module test harnesses can run standalone.
   **/
@@ -47,7 +33,7 @@
  int module_id = -1;
  struct exclude_struct **server_exclude_list;
 --- util.c     17 Feb 2004 23:13:10 -0000      1.132
-+++ util.c     6 Mar 2004 07:46:00 -0000
++++ util.c     13 Mar 2004 20:19:40 -0000
 @@ -28,6 +28,7 @@
  #include "rsync.h"