Updated to apply cleanly.

[rsync/rsync-patches.git] / id-pair.diff

diff --git a/id-pair.diff b/id-pair.diff
index 90df970..32683b9 100644 (file)
--- a/id-pair.diff
+++ b/id-pair.diff
@@ -148,7 +148,7 @@ gets to be really large.
                iflags |= ITEM_IS_NEW;
 --- old/rsync.c
 +++ new/rsync.c
-@@ -49,6 +49,7 @@ extern int inplace;
+@@ -50,6 +50,7 @@ extern int inplace;
  extern int keep_dirlinks;
  extern int make_backups;
  extern struct stats stats;
@@ -156,7 +156,7 @@ gets to be really large.
  
  #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
  iconv_t ic_chck = (iconv_t)-1;
-@@ -116,6 +117,8 @@ int set_file_attrs(char *fname, struct f
+@@ -125,6 +126,8 @@ int set_file_attrs(char *fname, struct f
        int updated = 0;
        STRUCT_STAT st2;
        int change_uid, change_gid;
@@ -165,7 +165,7 @@ gets to be really large.
  
        if (!st) {
                if (dry_run)
-@@ -148,9 +151,11 @@ int set_file_attrs(char *fname, struct f
+@@ -157,9 +160,11 @@ int set_file_attrs(char *fname, struct f
                        updated = 1;
        }
  
@@ -180,7 +180,7 @@ gets to be really large.
  #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
        if (S_ISLNK(st->st_mode))
                ;
-@@ -162,18 +167,18 @@ int set_file_attrs(char *fname, struct f
+@@ -171,18 +176,18 @@ int set_file_attrs(char *fname, struct f
                                rprintf(FINFO,
                                        "set uid of %s from %ld to %ld\n",
                                        fname,