Tweaked some define names.

diff --git a/early-chmod.diff b/early-chmod.diff
index 9887bbd..e3778e7 100644 (file)
--- a/early-chmod.diff
+++ b/early-chmod.diff
@@ -1,5 +1,5 @@
 --- backup.c   23 Feb 2004 07:03:03 -0000      1.27
-+++ backup.c   6 Mar 2004 07:25:05 -0000
++++ 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)
@@ -12,7 +12,7 @@
        return 0;
  }
 --- rsync.c    25 Feb 2004 21:20:59 -0000      1.133
-+++ rsync.c    6 Mar 2004 07:25:05 -0000
++++ rsync.c    6 Mar 2004 07:46:00 -0000
 @@ -235,15 +235,19 @@ void finish_transfer(char *fname, char *
        if (make_backups && !make_backup(fname))
                return;
@@ -37,7 +37,7 @@
  }
  
 --- t_stub.c   11 Sep 2003 04:48:13 -0000      1.4
-+++ t_stub.c   6 Mar 2004 07:25:05 -0000
++++ t_stub.c   6 Mar 2004 07:46:00 -0000
 @@ -26,6 +26,7 @@
   * functions, so that module test harnesses can run standalone.
   **/
@@ -47,7 +47,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:25:06 -0000
++++ util.c     6 Mar 2004 07:46:00 -0000
 @@ -28,6 +28,7 @@
  #include "rsync.h"
  
@@ -60,8 +60,8 @@
                return -1;
        }
  
-+      if (!am_root && !(mode & S_IWRITE))
-+              mode |= S_IWRITE;
++      if (!am_root && !(mode & S_IWUSR))
++              mode |= S_IWUSR;
        ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode);
        if (ofd == -1) {
                rprintf(FERROR,"open %s: %s\n",
@@ -80,8 +80,8 @@
                        break;
  #endif
                case EXDEV:
-+                      if (!am_root && !(mode & S_IREAD))
-+                              do_chmod(from, (mode & CHMOD_BITS) | S_IREAD);
++                      if (!am_root && !(mode & S_IRUSR))
++                              do_chmod(from, (mode & CHMOD_BITS) | S_IRUSR);
                        if (copy_file(from, to, mode) != 0)
                                return -2;
                        do_unlink(from);