[File-extattr-commits] File-ExtAttr extattr_macosx.c, 1.3, 1.4 extattr_os.h, 1.3, 1.4 portable.h, 1.12, 1.13

[Richard D. <ric...@us...>]

Update of /cvsroot/file-extattr/File-ExtAttr
In directory sc8-pr-cvs17:/tmp/cvs-serv4296

Modified Files:
	extattr_macosx.c extattr_os.h portable.h 
Log Message:
Fix build and tests on Mac OS X 10.4

Index: portable.h
===================================================================
RCS file: /cvsroot/file-extattr/File-ExtAttr/portable.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** portable.h	1 Oct 2006 11:18:54 -0000	1.12
--- portable.h	4 Nov 2007 09:00:10 -0000	1.13
***************
*** 83,87 ****
  portable_lenxattr (const char *path, const char *attrname, struct hv *flags)
  {
! #ifdef BSD
    /* XXX: flags? Namespace? */
    return extattr_get_file(path, EXTATTR_NAMESPACE_USER, attrname, NULL, 0);
--- 83,87 ----
  portable_lenxattr (const char *path, const char *attrname, struct hv *flags)
  {
! #ifdef EXTATTR_BSD
    /* XXX: flags? Namespace? */
    return extattr_get_file(path, EXTATTR_NAMESPACE_USER, attrname, NULL, 0);
***************
*** 95,99 ****
  portable_flenxattr (int fd, const char *attrname, struct hv *flags)
  {
! #ifdef BSD
    /* XXX: flags? Namespace? */
    return extattr_get_fd(fd, EXTATTR_NAMESPACE_USER, attrname, NULL, 0);
--- 95,99 ----
  portable_flenxattr (int fd, const char *attrname, struct hv *flags)
  {
! #ifdef EXTATTR_BSD
    /* XXX: flags? Namespace? */
    return extattr_get_fd(fd, EXTATTR_NAMESPACE_USER, attrname, NULL, 0);

Index: extattr_os.h
===================================================================
RCS file: /cvsroot/file-extattr/File-ExtAttr/extattr_os.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** extattr_os.h	19 Aug 2006 14:06:23 -0000	1.3
--- extattr_os.h	4 Nov 2007 09:00:10 -0000	1.4
***************
*** 5,14 ****
  #include <sys/param.h>
  
! #ifdef BSD
! #define EXTATTR_BSD
  #endif
  
! #ifdef __APPLE__
! #define EXTATTR_MACOSX
  #endif
  
--- 5,14 ----
  #include <sys/param.h>
  
! #if defined(__MACH__) && defined(__APPLE__)
! #define EXTATTR_MACOSX
  #endif
  
! #if defined(BSD) && !defined(EXTATTR_MACOSX)
! #define EXTATTR_BSD
  #endif
  

Index: extattr_macosx.c
===================================================================
RCS file: /cvsroot/file-extattr/File-ExtAttr/extattr_macosx.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** extattr_macosx.c	2 Oct 2006 20:30:09 -0000	1.3
--- extattr_macosx.c	4 Nov 2007 09:00:10 -0000	1.4
***************
*** 36,40 ****
  
    if (ok)
!     ret = setxattr(path, attrname, attrvalue, slen, xflags);
  
    return ok ? ret : -1;
--- 36,40 ----
  
    if (ok)
!     ret = setxattr(path, attrname, attrvalue, slen, 0, xflags);
  
    return ok ? ret : -1;
***************
*** 68,72 ****
  
    if (ok)
!     ret = fsetxattr(fd, attrname, attrvalue, slen, xflags);
  
    return ok ? ret : -1;
--- 68,72 ----
  
    if (ok)
!     ret = fsetxattr(fd, attrname, attrvalue, slen, 0, xflags);
  
    return ok ? ret : -1;