diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-06-03 11:32:55 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-06-03 06:21:21 +0200 |
| commit | c0b9a128d140cd911dee2533b5eb453251e2db57 (patch) | |
| tree | 554ddd84d54f8cf99438698ad938d33af77bc5df /lib | |
| parent | 4143a935e5abbb897f38f159fd0330c09b58bdda (diff) | |
| download | samba-c0b9a128d140cd911dee2533b5eb453251e2db57.tar.gz samba-c0b9a128d140cd911dee2533b5eb453251e2db57.tar.bz2 samba-c0b9a128d140cd911dee2533b5eb453251e2db57.zip | |
libreplace: Fix up MacOS xattr functions
We need undo the rep_ macro to call the real OS function.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Sun Jun 3 06:21:21 CEST 2012 on sn-devel-104
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/replace/xattr.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/lib/replace/xattr.c b/lib/replace/xattr.c index 6518f31dcd..f5b1787001 100644 --- a/lib/replace/xattr.c +++ b/lib/replace/xattr.c @@ -49,6 +49,9 @@ ssize_t rep_getxattr (const char *path, const char *name, void *value, size_t si #ifndef XATTR_ADDITIONAL_OPTIONS return getxattr(path, name, value, size); #else + +/* So that we do not recursivly call this function */ +#undef getxattr int options = 0; return getxattr(path, name, value, size, 0, options); #endif @@ -105,6 +108,9 @@ ssize_t rep_fgetxattr (int filedes, const char *name, void *value, size_t size) #ifndef XATTR_ADDITIONAL_OPTIONS return fgetxattr(filedes, name, value, size); #else + +/* So that we do not recursivly call this function */ +#undef fgetxattr int options = 0; return fgetxattr(filedes, name, value, size, 0, options); #endif @@ -318,6 +324,8 @@ ssize_t rep_listxattr (const char *path, char *list, size_t size) #ifndef XATTR_ADDITIONAL_OPTIONS return listxattr(path, list, size); #else +/* So that we do not recursivly call this function */ +#undef listxattr int options = 0; return listxattr(path, list, size, options); #endif @@ -349,6 +357,8 @@ ssize_t rep_flistxattr (int filedes, char *list, size_t size) #ifndef XATTR_ADDITIONAL_OPTIONS return flistxattr(filedes, list, size); #else +/* So that we do not recursivly call this function */ +#undef flistxattr int options = 0; return flistxattr(filedes, list, size, options); #endif @@ -380,6 +390,8 @@ int rep_removexattr (const char *path, const char *name) #ifndef XATTR_ADDITIONAL_OPTIONS return removexattr(path, name); #else +/* So that we do not recursivly call this function */ +#undef removexattr int options = 0; return removexattr(path, name, options); #endif @@ -419,6 +431,8 @@ int rep_fremovexattr (int filedes, const char *name) #ifndef XATTR_ADDITIONAL_OPTIONS return fremovexattr(filedes, name); #else +/* So that we do not recursivly call this function */ +#undef fremovexattr int options = 0; return fremovexattr(filedes, name, options); #endif @@ -458,6 +472,8 @@ int rep_setxattr (const char *path, const char *name, const void *value, size_t #ifndef XATTR_ADDITIONAL_OPTIONS return setxattr(path, name, value, size, flags); #else +/* So that we do not recursivly call this function */ +#undef setxattr int options = 0; return setxattr(path, name, value, size, 0, options); #endif @@ -523,6 +539,8 @@ int rep_fsetxattr (int filedes, const char *name, const void *value, size_t size #ifndef XATTR_ADDITIONAL_OPTIONS return fsetxattr(filedes, name, value, size, flags); #else +/* So that we do not recursivly call this function */ +#undef fsetxattr int options = 0; return fsetxattr(filedes, name, value, size, 0, options); #endif |