Changed the unique_prefix and upre_len vars into defines.

diff --git a/fake-super.diff b/fake-super.diff
index 167789a..faa3ea8 100644 (file)
--- a/fake-super.diff
+++ b/fake-super.diff
@@ -31,7 +31,13 @@ you'll need to turn the copy into a remote copy to localhost.
 After applying this patch, run these commands for a successful build:
 
     ./prepare-source
-    ./configure
+    ./configure --enable-xattr-support
+    make
+
+or, if you want ACL support too:
+
+    ./prepare-source
+    ./configure --enable-acl-support --enable-xattr-support
     make
 
 --- old/backup.c
@@ -398,8 +404,8 @@ After applying this patch, run these commands for a successful build:
                        rxa->datum = ptr + name_len;
 +
  #ifdef HAVE_OSX_XATTRS
-                       if (strncmp(rxa->name, unique_prefix, upre_len) == 0) {
-                               rxa->name_len -= upre_len;
+                       if (strncmp(rxa->name, UNIQUE_PREFIX, UPRE_LEN) == 0) {
+                               rxa->name_len -= UPRE_LEN;
 @@ -365,4 +384,103 @@ int set_xattr(const char *fname, const s
        return rsync_xal_set(fname, lst + ndx); /* TODO:  This needs to return 1 if no xattrs changed! */
  }

diff --git a/xattrs.diff b/xattrs.diff
index 9160705..e394781 100644 (file)
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -610,8 +610,8 @@ TODO:
 +static item_list rsync_xal_l = EMPTY_ITEM_LIST;
 +
 +#ifdef HAVE_OSX_XATTRS
-+static char unique_prefix[] = "user.0S%."; /* OSX */
-+static int upre_len = sizeof unique_prefix - 1;
++#define UNIQUE_PREFIX "user.0S%." /* OSX */
++#define UPRE_LEN (sizeof UNIQUE_PREFIX - 1)
 +#endif
 +
 +/* ------------------------------------------------------------------------- */
@@ -808,9 +808,9 @@ TODO:
 +#ifdef HAVE_OSX_XATTRS
 +                      if (strncmp(rxa->name, "user.", 5) != 0
 +                       && strncmp(rxa->name, "system.", 7) != 0) {
-+                              write_int(f, rxa->name_len + upre_len);
++                              write_int(f, rxa->name_len + UPRE_LEN);
 +                              write_int(f, rxa->datum_len);
-+                              write_buf(f, unique_prefix, upre_len);
++                              write_buf(f, UNIQUE_PREFIX, UPRE_LEN);
 +                      } else
 +#endif
 +                      {
@@ -855,9 +855,9 @@ TODO:
 +                      rxa->name = ptr;
 +                      rxa->datum = ptr + name_len;
 +#ifdef HAVE_OSX_XATTRS
-+                      if (strncmp(rxa->name, unique_prefix, upre_len) == 0) {
-+                              rxa->name_len -= upre_len;
-+                              memmove(rxa->name, rxa->name + upre_len, rxa->name_len);
++                      if (strncmp(rxa->name, UNIQUE_PREFIX, UPRE_LEN) == 0) {
++                              rxa->name_len -= UPRE_LEN;
++                              memmove(rxa->name, rxa->name + UPRE_LEN, rxa->name_len);
 +                      }
 +#endif
 +              }