aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeebs <seebs@seebs.net>2011-03-24 15:54:39 -0500
committerSeebs <seebs@seebs.net>2011-03-24 15:54:39 -0500
commita15f432fd27d3a061369dca724d541394be20d49 (patch)
treed5f0f3dd9a20a20daf5d55a37458d3c49100a799
parentd69f26606f53f71adf91a20f6e6456cc306652a0 (diff)
downloadpseudo-a15f432fd27d3a061369dca724d541394be20d49.tar.gz
pseudo-a15f432fd27d3a061369dca724d541394be20d49.tar.bz2
pseudo-a15f432fd27d3a061369dca724d541394be20d49.zip
Woo! Last obvious error fixed.
-rw-r--r--ChangeLog.txt1
-rw-r--r--ports/darwin/guts/fgetxattr.c4
-rw-r--r--ports/darwin/guts/flistxattr.c4
-rw-r--r--ports/darwin/guts/fsetxattr.c4
-rw-r--r--ports/darwin/guts/getxattr.c4
-rw-r--r--ports/darwin/guts/listxattr.c4
-rw-r--r--ports/darwin/guts/setxattr.c4
-rw-r--r--ports/darwin/wrapfuncs.in12
8 files changed, 19 insertions, 18 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 2ac7962..fa05d18 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -2,6 +2,7 @@
* (seebs) more work on OS X port.
* (seebs) include errno in the verbose debug output
* (seebs) fix darwin fcntl.
+ * (seebs) fix *xattr for darwin (they take more arguments)
2011-02-18:
* (seebs) moving things to Unix port, cleanup for Darwin
diff --git a/ports/darwin/guts/fgetxattr.c b/ports/darwin/guts/fgetxattr.c
index 1752dff..1cd8904 100644
--- a/ports/darwin/guts/fgetxattr.c
+++ b/ports/darwin/guts/fgetxattr.c
@@ -2,11 +2,11 @@
* Copyright (c) 2011 Wind River Systems; see
* guts/COPYRIGHT for information.
*
- * ssize_t fgetxattr(int filedes, const char *name, void *value, size_t size)
+ * ssize_t fgetxattr(int filedes, const char *name, void *value, size_t size, u_int32_t position, int options)
* ssize_t rc = -1;
*/
- rc = real_fgetxattr(filedes, name, value, size);
+ rc = real_fgetxattr(filedes, name, value, size, position, options);
/* return rc;
* }
diff --git a/ports/darwin/guts/flistxattr.c b/ports/darwin/guts/flistxattr.c
index 2c0fe7c..7575f28 100644
--- a/ports/darwin/guts/flistxattr.c
+++ b/ports/darwin/guts/flistxattr.c
@@ -2,11 +2,11 @@
* Copyright (c) 2011 Wind River Systems; see
* guts/COPYRIGHT for information.
*
- * ssize_t flistxattr(int filedes, char *list, size_t size)
+ * ssize_t flistxattr(int filedes, char *list, size_t size, int options)
* ssize_t rc = -1;
*/
- rc = real_flistxattr(filedes, list, size);
+ rc = real_flistxattr(filedes, list, size, options);
/* return rc;
* }
diff --git a/ports/darwin/guts/fsetxattr.c b/ports/darwin/guts/fsetxattr.c
index 0de3dfc..541569a 100644
--- a/ports/darwin/guts/fsetxattr.c
+++ b/ports/darwin/guts/fsetxattr.c
@@ -2,11 +2,11 @@
* Copyright (c) 2011 Wind River Systems; see
* guts/COPYRIGHT for information.
*
- * int fsetxattr(int filedes, const char *name, const void *value, size_t size, int flags)
+ * int fsetxattr(int filedes, const char *name, const void *value, size_t size, u_int32_t position, int options)
* int rc = -1;
*/
- rc = real_fsetxattr(filedes, name, value, size, flags);
+ rc = real_fsetxattr(filedes, name, value, size, position, options);
/* return rc;
* }
diff --git a/ports/darwin/guts/getxattr.c b/ports/darwin/guts/getxattr.c
index 96fc1e8..16f0993 100644
--- a/ports/darwin/guts/getxattr.c
+++ b/ports/darwin/guts/getxattr.c
@@ -2,11 +2,11 @@
* Copyright (c) 2011 Wind River Systems; see
* guts/COPYRIGHT for information.
*
- * ssize_t getxattr(const char *pathname, const char *name, void *value, size_t size)
+ * ssize_t getxattr(const char *pathname, const char *name, void *value, size_t size, u_int32_t position, int options)
* ssize_t rc = -1;
*/
- rc = real_getxattr(pathname, name, value, size);
+ rc = real_getxattr(pathname, name, value, size, position, options);
/* return rc;
* }
diff --git a/ports/darwin/guts/listxattr.c b/ports/darwin/guts/listxattr.c
index 4b48ac6..0bba451 100644
--- a/ports/darwin/guts/listxattr.c
+++ b/ports/darwin/guts/listxattr.c
@@ -2,11 +2,11 @@
* Copyright (c) 2011 Wind River Systems; see
* guts/COPYRIGHT for information.
*
- * ssize_t listxattr(const char *pathname, char *list, size_t size)
+ * ssize_t listxattr(const char *pathname, char *list, size_t size, int options)
* ssize_t rc = -1;
*/
- rc = real_listxattr(pathname, list, size);
+ rc = real_listxattr(pathname, list, size, options);
/* return rc;
* }
diff --git a/ports/darwin/guts/setxattr.c b/ports/darwin/guts/setxattr.c
index 9458a69..3c8fd3d 100644
--- a/ports/darwin/guts/setxattr.c
+++ b/ports/darwin/guts/setxattr.c
@@ -2,11 +2,11 @@
* Copyright (c) 2011 Wind River Systems; see
* guts/COPYRIGHT for information.
*
- * int setxattr(const char *pathname, const char *name, const void *value, size_t size, int flags)
+ * int setxattr(const char *pathname, const char *name, const void *value, size_t size, u_int32_t position, int options)
* int rc = -1;
*/
- rc = real_setxattr(pathname, name, value, size, flags);
+ rc = real_setxattr(pathname, name, value, size, position, options);
/* return rc;
* }
diff --git a/ports/darwin/wrapfuncs.in b/ports/darwin/wrapfuncs.in
index e8f2833..39d9893 100644
--- a/ports/darwin/wrapfuncs.in
+++ b/ports/darwin/wrapfuncs.in
@@ -9,12 +9,12 @@ int fcntl(int fd, int cmd, ...{struct flock *lock});
int getgrouplist(const char *user, gid_t group, gid_t *groups, int *ngroups);
# we use "pathname" to avoid canonicalizing paths, because these functions are
# unimplemented
-ssize_t getxattr(const char *pathname, const char *name, void *value, size_t size);
-ssize_t fgetxattr(int filedes, const char *name, void *value, size_t size);
-ssize_t listxattr(const char *pathname, char *list, size_t size);
-ssize_t flistxattr(int filedes, char *list, size_t size);
-int setxattr(const char *pathname, const char *name, const void *value, size_t size, int flags);
-int fsetxattr(int filedes, const char *name, const void *value, size_t size, int flags);
+ssize_t getxattr(const char *pathname, const char *name, void *value, size_t size, u_int32_t position, int options);
+ssize_t fgetxattr(int filedes, const char *name, void *value, size_t size, u_int32_t position, int options);
+ssize_t listxattr(const char *pathname, char *list, size_t size, int options);
+ssize_t flistxattr(int filedes, char *list, size_t size, int options);
+int setxattr(const char *pathname, const char *name, const void *value, size_t size, u_int32_t position, int options);
+int fsetxattr(int filedes, const char *name, const void *value, size_t size, u_int32_t position, int options);
# local color UIDs
int getgrouplist(const char *name, int basegid, int *groups, int *ngroups);
int scandir(const char *path, struct dirent ***namelist, int (*filter)(struct dirent *), int (*compar)());