Got rid of failing or fuzzy hunks.

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

diff --git a/early-chmod.diff b/early-chmod.diff
index a90f6c2..095d414 100644 (file)
--- a/early-chmod.diff
+++ b/early-chmod.diff
@@ -1,4 +1,4 @@
---- orig/rsync.c       2004-07-23 17:16:13
+--- orig/rsync.c       2004-07-26 16:06:53
 +++ rsync.c    2004-07-26 06:27:27
 @@ -246,6 +246,9 @@ void finish_transfer(char *fname, char *
                goto do_set_perms;
@@ -21,7 +21,7 @@
      do_set_perms:
        set_perms(fname, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME);
  }
---- orig/t_stub.c      2004-05-15 20:10:13
+--- orig/t_stub.c      2004-07-29 16:08:04
 +++ t_stub.c   2004-07-03 20:17:55
 @@ -26,6 +26,7 @@
   * functions, so that module test harnesses can run standalone.
@@ -30,8 +30,8 @@
 +int am_root = 0;
  int modify_window = 0;
  int module_id = -1;
- struct exclude_list_struct server_exclude_list;
---- orig/util.c        2004-06-09 21:54:47
+ char *partial_dir;
+--- orig/util.c        2004-07-29 16:08:04
 +++ util.c     2004-07-03 20:17:55
 @@ -29,6 +29,7 @@
  
@@ -40,8 +40,8 @@
 +extern int am_root;
  extern int module_id;
  extern int modify_window;
- extern struct exclude_list_struct server_exclude_list;
-@@ -263,6 +264,8 @@ int copy_file(char *source, char *dest, 
+ extern char *partial_dir;
+@@ -264,6 +265,8 @@ int copy_file(char *source, char *dest, 
                return -1;
        }
  
@@ -50,7 +50,7 @@
        ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode);
        if (ofd == -1) {
                rsyserr(FERROR, errno, "open %s", full_fname(dest));
-@@ -361,8 +364,8 @@ int robust_unlink(char *fname)
+@@ -362,8 +365,8 @@ int robust_unlink(char *fname)
  #endif
  }
  
@@ -61,7 +61,7 @@
  int robust_rename(char *from, char *to, int mode)
  {
        int tries = 4;
-@@ -379,10 +382,12 @@ int robust_rename(char *from, char *to, 
+@@ -380,10 +383,12 @@ int robust_rename(char *from, char *to, 
                        break;
  #endif
                case EXDEV: