From: Wayne Davison <wayned@samba.org>
Date: Sun, 21 Jan 2007 04:55:07 +0000 (+0000)
Subject: Applied Matt's fix for a misplaced hunk.
X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/3829f6bbbc5d3f38d7e26180e83f9bbf3e66e5e7

Applied Matt's fix for a misplaced hunk.
---

diff --git a/acls.diff b/acls.diff
index 05f7ce4..6cbafcc 100644
--- a/acls.diff
+++ b/acls.diff
@@ -1342,7 +1342,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  #ifdef SUPPORT_LINKS
  	if (preserve_links && S_ISLNK(f->mode)) {
  		rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
-@@ -712,6 +715,12 @@ static struct file_struct *recv_file_ent
+@@ -715,6 +718,12 @@ static struct file_struct *recv_file_ent
  	}
  #endif
  
@@ -1355,7 +1355,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	if (always_checksum && S_ISREG(mode))
  		extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
  
-@@ -849,6 +858,11 @@ static struct file_struct *recv_file_ent
+@@ -852,6 +861,11 @@ static struct file_struct *recv_file_ent
  			read_buf(f, bp, checksum_len);
  	}
  
@@ -1364,10 +1364,10 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +		receive_acl(file, f);
 +#endif
 +
- 	return file;
- }
+ 	if (S_ISREG(mode) || S_ISLNK(mode))
+ 		stats.total_size += file_length;
  
-@@ -1120,6 +1134,9 @@ static struct file_struct *send_file_nam
+@@ -1123,6 +1137,9 @@ static struct file_struct *send_file_nam
  					  int flags, int filter_flags)
  {
  	struct file_struct *file;
@@ -1377,7 +1377,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
  	file = make_file(fname, flist, stp, flags, filter_flags);
  	if (!file)
-@@ -1128,12 +1145,26 @@ static struct file_struct *send_file_nam
+@@ -1131,12 +1148,26 @@ static struct file_struct *send_file_nam
  	if (chmod_modes && !S_ISLNK(file->mode))
  		file->mode = tweak_mode(file->mode, chmod_modes);
  
@@ -2231,7 +2231,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
  	if (f_copy >= 0) {
  		close(f_copy);
-@@ -1646,6 +1727,13 @@ static void recv_generator(char *fname, 
+@@ -1646,6 +1727,12 @@ static void recv_generator(char *fname, 
  	}
  
  	close(fd);
@@ -2241,11 +2241,10 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +	if (preserve_acls)
 +		free_acl(&sx);
 +#endif
-+	return;
  }
  
- void generate_files(int f_out, char *local_name)
-@@ -1708,6 +1796,8 @@ void generate_files(int f_out, char *loc
+ static void touch_up_dirs(struct file_list *flist, int ndx,
+@@ -1742,6 +1829,8 @@ void generate_files(int f_out, char *loc
  	 * notice that and let us know via the redo pipe (or its closing). */
  	ignore_timeout = 1;
  
@@ -6152,7 +6151,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
   -o, --owner                 preserve owner (super-user only)
   -g, --group                 preserve group
       --devices               preserve device files (super-user only)
-@@ -754,7 +755,9 @@ quote(itemization(
+@@ -771,7 +772,9 @@ quote(itemization(
    permissions, though the bf(--executability) option might change just
    the execute permission for the file.
    it() New files get their "normal" permission bits set to the source
@@ -6163,7 +6162,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
    their special permission bits disabled except in the case where a new
    directory inherits a setgid bit from its parent directory.
  ))
-@@ -785,9 +788,11 @@ The preservation of the destination's se
+@@ -802,9 +805,11 @@ The preservation of the destination's se
  directories when bf(--perms) is off was added in rsync 2.6.7.  Older rsync
  versions erroneously preserved the three special permission bits for
  newly-created files when bf(--perms) was off, while overriding the
@@ -6178,7 +6177,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
  dit(bf(-E, --executability)) This option causes rsync to preserve the
  executability (or non-executability) of regular files when bf(--perms) is
-@@ -805,6 +810,14 @@ quote(itemization(
+@@ -822,6 +827,14 @@ quote(itemization(
  
  If bf(--perms) is enabled, this option is ignored.
  
@@ -6193,7 +6192,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  dit(bf(--chmod)) This option tells rsync to apply one or more
  comma-separated "chmod" strings to the permission of the files in the
  transfer.  The resulting value is treated as though it was the permissions
-@@ -1402,8 +1415,8 @@ if the receiving rsync is at least versi
+@@ -1426,8 +1439,8 @@ if the receiving rsync is at least versi
  with older versions of rsync, but that also turns on the output of other
  verbose messages).
  
@@ -6204,7 +6203,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  type of update being done, bf(X) is replaced by the file-type, and the
  other letters represent attributes that may be output if they are being
  modified.
-@@ -1452,7 +1465,11 @@ quote(itemization(
+@@ -1476,7 +1489,11 @@ quote(itemization(
    sender's value (requires bf(--owner) and super-user privileges).
    it() A bf(g) means the group is different and is being updated to the
    sender's value (requires bf(--group) and the authority to set the group).