From: Wayne Davison <wayned@samba.org>
Date: Sun, 17 Dec 2006 01:32:37 +0000 (+0000)
Subject: Fixed some compilation errors that crept into the code.
X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/3b3650bb181bc2df78f70fa36f5b63743c20cf46?hp=fdf967c7385fcb3ca1141d12fa2c8ea1f7953132

Fixed some compilation errors that crept into the code.
---

diff --git a/acls.diff b/acls.diff
index 5bd3571..67d5ca4 100644
--- a/acls.diff
+++ b/acls.diff
@@ -31,7 +31,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
 --- old/acls.c
 +++ new/acls.c
-@@ -0,0 +1,1096 @@
+@@ -0,0 +1,1093 @@
 +/*
 + * Handle passing Access Control Lists between systems.
 + *
@@ -63,9 +63,6 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +extern int read_only;
 +extern int list_only;
 +extern int orig_umask;
-+extern int preserve_acls;
-+extern int flist_extra_ndx;
-+extern unsigned int file_struct_len;
 +
 +/* === ACL structures === */
 +
@@ -1351,7 +1348,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +#ifdef SUPPORT_ACLS
 +	/* We need one or two index int32s when we're preserving ACLs. */
 +	if (preserve_acls)
-+		extra_len += (S_ISDIR(mode) ? 2 : 1) * sizeof (union flist_extras);
++		extra_len += (S_ISDIR(mode) ? 2 : 1) * EXTRA_LEN;
 +#endif
 +
  	if (always_checksum && S_ISREG(mode))
@@ -5973,7 +5970,15 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  #define GID_NONE ((gid_t)-1)
  
  union file_extras {
-@@ -554,10 +562,12 @@ extern int preserve_gid;
+@@ -522,6 +530,7 @@ struct file_struct {
+ extern int flist_extra_cnt;
+ extern int preserve_uid;
+ extern int preserve_gid;
++extern int preserve_acls;
+ 
+ #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
+ #define EXTRA_LEN (sizeof (union file_extras))
+@@ -554,10 +563,12 @@ extern int preserve_gid;
  /* When the associated option is on, all entries will have these present: */
  #define F_UID(f) REQ_EXTRA(f, preserve_uid)->unum
  #define F_GID(f) REQ_EXTRA(f, preserve_gid)->unum
@@ -5986,7 +5991,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
  /* This optional item might follow an F_HL_*() item.
   * (Note: a device doesn't need to check LEN64_BUMP(f).) */
-@@ -693,6 +703,17 @@ struct stats {
+@@ -693,6 +704,17 @@ struct stats {
  
  struct chmod_mode_struct;
  
@@ -6004,7 +6009,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  #include "byteorder.h"
  #include "lib/mdfour.h"
  #include "lib/wildmatch.h"
-@@ -711,6 +732,16 @@ struct chmod_mode_struct;
+@@ -711,6 +733,16 @@ struct chmod_mode_struct;
  #define NORETURN __attribute__((__noreturn__))
  #endif