From: Wayne Davison <wayned@samba.org>
Date: Sun, 13 Feb 2005 22:01:54 +0000 (+0000)
Subject: Fixed a failing hunk.
X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/618752a7ee3f8cc7142891eb7eb3c3ba6550dd16

Fixed a failing hunk.
---

diff --git a/acls.diff b/acls.diff
index 9764ade..04edaa1 100644
--- a/acls.diff
+++ b/acls.diff
@@ -1285,8 +1285,8 @@ ACLs to a non-ACL-supporting disk should complain.
  AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
  AC_OUTPUT
  
---- orig/flist.c	2005-02-12 19:54:27
-+++ flist.c	2004-07-03 20:11:58
+--- orig/flist.c	2005-02-13 21:17:16
++++ flist.c	2005-02-13 21:58:44
 @@ -977,6 +977,8 @@ void send_file_name(int f, struct file_l
  
  	if (!(file = make_file(fname, flist, ALL_FILTERS)))
@@ -1307,16 +1307,16 @@ ACLs to a non-ACL-supporting disk should complain.
  	}
  
  	if (recursive && S_ISDIR(file->mode)
-@@ -1289,6 +1295,8 @@ struct file_list *recv_file_list(int f)
+@@ -1293,6 +1299,8 @@ struct file_list *recv_file_list(int f)
  			flags |= read_byte(f) << 8;
- 		receive_file_entry(flist, i, flags, f);
+ 		file = receive_file_entry(flist, flags, f);
  
-+		RECEIVE_ACL(flist->files[i], f);
++		RECEIVE_ACL(file, f);
 +
- 		if (S_ISREG(flist->files[i]->mode))
- 			stats.total_size += flist->files[i]->length;
+ 		if (S_ISREG(file->mode))
+ 			stats.total_size += file->length;
  
-@@ -1311,6 +1319,8 @@ struct file_list *recv_file_list(int f)
+@@ -1315,6 +1323,8 @@ struct file_list *recv_file_list(int f)
  
  	clean_flist(flist, relative_paths, 1);
  
@@ -1325,9 +1325,9 @@ ACLs to a non-ACL-supporting disk should complain.
  	if (f != -1) {
  		/* Now send the uid/gid list. This was introduced in
  		 * protocol version 15 */
---- orig/generator.c	2005-02-11 20:25:07
+--- orig/generator.c	2005-02-13 05:50:28
 +++ generator.c	2005-01-30 10:09:44
-@@ -315,6 +315,10 @@ static void recv_generator(char *fname, 
+@@ -324,6 +324,10 @@ static void recv_generator(char *fname, 
  		if (set_perms(fname, file, statret ? NULL : &st, 0)
  		    && verbose && f_out != -1)
  			rprintf(FINFO, "%s/\n", safe_fname(fname));
@@ -4597,7 +4597,7 @@ ACLs to a non-ACL-supporting disk should complain.
    next;
  }
  
---- orig/options.c	2005-02-11 18:21:45
+--- orig/options.c	2005-02-13 05:50:28
 +++ options.c	2004-08-19 17:38:57
 @@ -44,6 +44,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;
@@ -4748,7 +4748,7 @@ ACLs to a non-ACL-supporting disk should complain.
  #include "proto.h"
  
  /* We have replacement versions of these if they're missing. */
---- orig/rsync.yo	2005-02-12 19:54:28
+--- orig/rsync.yo	2005-02-13 21:51:10
 +++ rsync.yo	2004-07-03 20:11:58
 @@ -317,6 +317,7 @@ to the detailed description below for a 
   -H, --hard-links            preserve hard links