From 5397d015f4a69a0762e71a7446671df623b4fe00 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 12 Feb 2005 20:01:43 +0000 Subject: [PATCH] Fixed some patch fuzz. --- acls.diff | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/acls.diff b/acls.diff index 3b2d22c..9764ade 100644 --- a/acls.diff +++ b/acls.diff @@ -1285,18 +1285,18 @@ 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-09 02:37:15 +--- orig/flist.c 2005-02-12 19:54:27 +++ flist.c 2004-07-03 20:11:58 -@@ -982,6 +982,8 @@ void send_file_name(int f, struct file_l +@@ -977,6 +977,8 @@ void send_file_name(int f, struct file_l - if (!file) + if (!(file = make_file(fname, flist, ALL_FILTERS))) return; + if (!MAKE_ACL(file, fname)) + return; maybe_emit_filelist_progress(flist); -@@ -990,6 +992,10 @@ void send_file_name(int f, struct file_l +@@ -985,6 +987,10 @@ void send_file_name(int f, struct file_l if (file->basename[0]) { flist->files[flist->count++] = file; send_file_entry(file, f, base_flags); @@ -1307,7 +1307,7 @@ ACLs to a non-ACL-supporting disk should complain. } if (recursive && S_ISDIR(file->mode) -@@ -1309,6 +1315,8 @@ struct file_list *recv_file_list(int f) +@@ -1289,6 +1295,8 @@ struct file_list *recv_file_list(int f) flags |= read_byte(f) << 8; receive_file_entry(flist, i, flags, f); @@ -1316,7 +1316,7 @@ ACLs to a non-ACL-supporting disk should complain. if (S_ISREG(flist->files[i]->mode)) stats.total_size += flist->files[i]->length; -@@ -1331,6 +1339,8 @@ struct file_list *recv_file_list(int f) +@@ -1311,6 +1319,8 @@ struct file_list *recv_file_list(int f) clean_flist(flist, relative_paths, 1); @@ -4705,9 +4705,9 @@ ACLs to a non-ACL-supporting disk should complain. if (verbose > 1 && flags & PERMS_REPORT) { if (updated) rprintf(FINFO, "%s\n", safe_fname(fname)); ---- orig/rsync.h 2005-02-07 20:41:57 +--- orig/rsync.h 2005-02-12 19:54:27 +++ rsync.h 2004-07-03 20:11:58 -@@ -607,6 +607,40 @@ struct stats { +@@ -610,6 +610,40 @@ struct stats { #include "lib/permstring.h" #include "lib/addrinfo.h" @@ -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-11 23:14:49 +--- orig/rsync.yo 2005-02-12 19:54:28 +++ 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 -- 2.34.1