make errors, rsync 2.6.9 with acls patch

[david]

On Dec 4, 2006, at 6:21 PM, Wayne Davison wrote:

> [Replying to the original thread, not the hijacked thread.]
>
> david wrote:
>> Looks like my initial question is ignored in place of Dmitry's.
>
> Not ignored by me, but since I don't know OS X, I can't answer it.
> Hopefully someone familiar with OS X will come by and help out.
>
> ..wayne..

Did not mean to seem "snippy" was just a bit confuzzled by it.

All my efforts so far have been on an Intel (Mac OS X) client machine  
(with ACLs enabled), I hope to have time tomorrow to try a compile &  
make of 2.6.8 and/or 2.6.9 on OS X Server 10.4.8

I'll readily admit I don't know how to proceed from the error

patching file flist.c
Hunk #1 FAILED at 998.
Hunk #2 FAILED at 1006.
patch unexpectedly ends in middle of line
Hunk #3 FAILED at 1021.
3 out of 3 hunks FAILED -- saving rejects to file flist.c.rej

Here's the content of flist.c.rej :

$ cat flist.c.rej

***************
*** 998,1004 ****
                  file->mode = tweak_mode(file->mode, chmod_modes);

   #ifdef SUPPORT_ACLS
-        if (preserve_acls) {
                  sx.st.st_mode = file->mode;
                  sx.acc_acl = sx.def_acl = NULL;
                  if (get_acl(fname, &sx) < 0)
--- 998,1004 ----
                  file->mode = tweak_mode(file->mode, chmod_modes);

   #ifdef SUPPORT_ACLS
+        if (preserve_acls && f >= 0) {
                  sx.st.st_mode = file->mode;
                  sx.acc_acl = sx.def_acl = NULL;
                  if (get_acl(fname, &sx) < 0)
***************
*** 1006,1012 ****
          }
   #endif
   #ifdef SUPPORT_XATTRS
-        if (preserve_xattrs) {
                  sx.xattr = NULL;
                  if (get_xattr(fname, &sx) < 0)
                          return NULL;
--- 1006,1012 ----
          }
   #endif
   #ifdef SUPPORT_XATTRS
+        if (preserve_xattrs && f >= 0) {
                  sx.xattr = NULL;
                  if (get_xattr(fname, &sx) < 0)
                          return NULL;
***************
*** 1021,1040 ****
                  flist->files[flist->count++] = file;
                  send_file_entry(file, f);
   #ifdef SUPPORT_ACLS
-                if (preserve_acls)
                          send_acl(&sx, f);
   #endif
   #ifdef SUPPORT_XATTRS
-                if (preserve_xattrs)
                          send_xattr(&sx, f);
   #endif
          } else {
   #ifdef SUPPORT_ACLS
-                if (preserve_acls)
                          free_acl(&sx);
   #endif
   #ifdef SUPPORT_XATTRS
-                if (preserve_xattrs)
                          free_xattr(&sx);
   #endif

--- 1021,1040 ----
                  flist->files[flist->count++] = file;
                  send_file_entry(file, f);
   #ifdef SUPPORT_ACLS
+                if (preserve_acls && f >= 0)
                          send_acl(&sx, f);
   #endif
   #ifdef SUPPORT_XATTRS
+                if (preserve_xattrs && f >= 0)
                          send_xattr(&sx, f);
   #endif
          } else {
   #ifdef SUPPORT_ACLS
+                if (preserve_acls && f >= 0)
                          free_acl(&sx);
   #endif
   #ifdef SUPPORT_XATTRS
+                if (preserve_xattrs && f >= 0)
                          free_xattr(&sx);
   #endif