#include <atalk/util.h>
#include <atalk/logger.h>
#include <atalk/ea.h>
-
-#ifndef ENOATTR
-#define ENOATTR ENODATA
-#endif
+#include <atalk/compat.h>
/******** Solaris EA helper function prototypes ********/
#ifdef HAVE_ATTROPEN
-#define SOLARIS_ATTRMODE S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP
+#define SOLARIS_ATTRMODE S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH
static int solaris_write_xattr(int attrfd, const char *value, size_t size);
static ssize_t solaris_read_xattr(int attrfd, void *value, size_t size);
static ssize_t solaris_list_xattr(int attrdirfd, char *list, size_t size);
#endif
}
+int sys_getxattrfd(int fd, const char *uname, int oflag, ...)
+{
+#if defined HAVE_ATTROPEN
+ int eafd;
+ va_list args;
+ mode_t mode = 0;
+
+ if (oflag & O_CREAT) {
+ va_start(args, oflag);
+ mode = va_arg(args, mode_t);
+ va_end(args);
+ }
+
+ if (oflag & O_CREAT)
+ eafd = solaris_openat(fd, uname, oflag | O_XATTR, mode);
+ else
+ eafd = solaris_openat(fd, uname, oflag | O_XATTR, mode);
+
+ return eafd;
+#else
+ errno = ENOSYS;
+ return -1;
+#endif
+}
+
ssize_t sys_getxattr (const char *path, const char *uname, void *value, size_t size)
{
const char *name = prefix(uname);
#endif
}
-ssize_t sys_fgetxattr (int filedes, const char *name, void *value, size_t size)
+ssize_t sys_fgetxattr (int filedes, const char *uname, void *value, size_t size)
{
+ const char *name = prefix(uname);
+
#if defined(HAVE_FGETXATTR)
#ifndef XATTR_ADD_OPT
return fgetxattr(filedes, name, value, size);
return retval;
}
- DEBUG(10,("sys_fgetxattr: extattr_get_fd() failed with: %s\n", strerror(errno)));
+ LOG(log_debug, logtype_default, "sys_fgetxattr: extattr_get_fd(): %s",
+ strerror(errno)));
return -1;
#elif defined(HAVE_ATTR_GETF)
int retval, flags = 0;
#endif
}
-int sys_fsetxattr (int filedes, const char *name, const void *value, size_t size, int flags)
+int sys_fsetxattr (int filedes, const char *uname, const void *value, size_t size, int flags)
{
+ const char *name = prefix(uname);
+
#if defined(HAVE_FSETXATTR)
#ifndef XATTR_ADD_OPT
return fsetxattr(filedes, name, value, size, flags);
/* Ignore other errors */
}
else {
- /* CREATE attribute, that already exists */
+ log_error, logtype_default /* CREATE attribute, that already exists */
if (flags & XATTR_CREATE) {
errno = EEXIST;
return -1;
}
if (closedir(dirp) == -1) {
- LOG(log_debug, logtype_default, "closedir dirp failed: %s\n",strerror(errno));
+ LOG(log_error, logtype_default, "closedir dirp: %s",strerror(errno));
return -1;
}
return len;
{
int filedes = attropen(path, attrpath, oflag, mode);
if (filedes == -1) {
- LOG(log_maxdebug, logtype_default, "attropen FAILED: path: %s, name: %s, errno: %s\n",path,attrpath,strerror(errno));
+ if (errno != ENOENT)
+ LOG(log_error, logtype_default, "attropen(\"%s\", ea:'%s'): %s",
+ path, attrpath, strerror(errno));
errno = ENOATTR;
}
return filedes;
{
int filedes = openat(fildes, path, oflag, mode);
if (filedes == -1) {
- LOG(log_maxdebug, logtype_default, "openat FAILED: fd: %s, path: %s, errno: %s\n",filedes,path,strerror(errno));
+ if (errno != ENOENT)
+ LOG(log_error, logtype_default, "openat(\"%s\"): %s",
+ path, strerror(errno));
+ errno = ENOATTR;
}
return filedes;
}
if ((ftruncate(attrfd, 0) == 0) && (write(attrfd, value, size) == size)) {
return 0;
} else {
- LOG(log_maxdebug, logtype_default, "solaris_write_xattr FAILED!\n");
+ LOG(log_error, logtype_default, "solaris_write_xattr: %s",
+ strerror(errno));
return -1;
}
}