Ignore object files

[netatalk.git] / libatalk / vfs / sys_ea.c

diff --git a/libatalk/vfs/sys_ea.c b/libatalk/vfs/sys_ea.c
index 1af3d5ea2cbb685006e2b622cbc485395fcfed22..44037a15f11a1e7ea6925c568a4b8b4be94b33ac 100644 (file)
--- a/libatalk/vfs/sys_ea.c
+++ b/libatalk/vfs/sys_ea.c
@@ -25,7 +25,7 @@
    Copyright (C) 2001 Andreas Gruenbacher.
       
    Samba 3.0.28, modified for netatalk.
-   $Id: sys_ea.c,v 1.2 2009-11-18 11:14:59 didg Exp $
+   $Id: sys_ea.c,v 1.6 2009-12-04 10:26:10 franklahm Exp $
    
 */
 
@@ -62,6 +62,10 @@
 #include <atalk/logger.h>
 #include <atalk/ea.h>
 
+#ifndef ENOATTR
+#define ENOATTR ENODATA
+#endif
+
 /******** Solaris EA helper function prototypes ********/
 #ifdef HAVE_ATTROPEN
 #define SOLARIS_ATTRMODE S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP
@@ -107,7 +111,7 @@ ssize_t sys_getxattr (const char *path, const char *uname, void *value, size_t s
        ssize_t retval;
        int attrnamespace = (strncmp(name, "system", 6) == 0) ? 
                EXTATTR_NAMESPACE_SYSTEM : EXTATTR_NAMESPACE_USER;
-       const char *attrname = ((s=strchr_m(name, '.')) == NULL) ? name : s + 1;
+       const char *attrname = ((s=strchr(name, '.')) == NULL) ? name : s + 1;
        /*
         * The BSD implementation has a nasty habit of silently truncating
         * the returned value to the size of the buffer, so we have to check
@@ -164,7 +168,7 @@ ssize_t sys_lgetxattr (const char *path, const char *uname, void *value, size_t
        ssize_t retval;
        int attrnamespace = (strncmp(name, "system", 6) == 0) ? 
                EXTATTR_NAMESPACE_SYSTEM : EXTATTR_NAMESPACE_USER;
-       const char *attrname = ((s=strchr_m(name, '.')) == NULL) ? name : s + 1;
+       const char *attrname = ((s=strchr(name, '.')) == NULL) ? name : s + 1;
 
        if((retval=extattr_get_link(path, attrnamespace, attrname, NULL, 0)) >= 0) {
                if(retval > size) {
@@ -476,7 +480,7 @@ int sys_removexattr (const char *path, const char *uname)
        char *s;
        int attrnamespace = (strncmp(name, "system", 6) == 0) ? 
                EXTATTR_NAMESPACE_SYSTEM : EXTATTR_NAMESPACE_USER;
-       const char *attrname = ((s=strchr_m(name, '.')) == NULL) ? name : s + 1;
+       const char *attrname = ((s=strchr(name, '.')) == NULL) ? name : s + 1;
 
        return extattr_delete_file(path, attrnamespace, attrname);
 #elif defined(HAVE_ATTR_REMOVE)
@@ -514,7 +518,7 @@ int sys_lremovexattr (const char *path, const char *uname)
        char *s;
        int attrnamespace = (strncmp(name, "system", 6) == 0) ? 
                EXTATTR_NAMESPACE_SYSTEM : EXTATTR_NAMESPACE_USER;
-       const char *attrname = ((s=strchr_m(name, '.')) == NULL) ? name : s + 1;
+       const char *attrname = ((s=strchr(name, '.')) == NULL) ? name : s + 1;
 
        return extattr_delete_link(path, attrnamespace, attrname);
 #elif defined(HAVE_ATTR_REMOVE)
@@ -555,7 +559,7 @@ int sys_setxattr (const char *path, const char *uname, const void *value, size_t
        int retval = 0;
        int attrnamespace = (strncmp(name, "system", 6) == 0) ? 
                EXTATTR_NAMESPACE_SYSTEM : EXTATTR_NAMESPACE_USER;
-       const char *attrname = ((s=strchr_m(name, '.')) == NULL) ? name : s + 1;
+       const char *attrname = ((s=strchr(name, '.')) == NULL) ? name : s + 1;
        if (flags) {
                /* Check attribute existence */
                retval = extattr_get_file(path, attrnamespace, attrname, NULL, 0);
@@ -619,7 +623,7 @@ int sys_lsetxattr (const char *path, const char *uname, const void *value, size_
        int retval = 0;
        int attrnamespace = (strncmp(name, "system", 6) == 0) ? 
                EXTATTR_NAMESPACE_SYSTEM : EXTATTR_NAMESPACE_USER;
-       const char *attrname = ((s=strchr_m(name, '.')) == NULL) ? name : s + 1;
+       const char *attrname = ((s=strchr(name, '.')) == NULL) ? name : s + 1;
        if (flags) {
                /* Check attribute existence */
                retval = extattr_get_link(path, attrnamespace, attrname, NULL, 0);
@@ -669,93 +673,6 @@ int sys_lsetxattr (const char *path, const char *uname, const void *value, size_
 #endif
 }
 
-/* copy EA, from LGPL2.1 libattr attr_copy_file.c
-   should use fgetxattr? We don't have them but they are in Samba.
-   Or add a sys_copyfxattr? Currently it's only call by afp_copyfile so we can open
-   the both files for reading and get a fd.
-
-   Or don't use sys_xxx and copy all attributes.
-
-*/
-int sys_copyxattr(const char *src_path, const char *dst_path)
-{
-#if defined(HAVE_LISTXATTR) && defined(HAVE_GETXATTR) && defined(HAVE_SETXATTR)
-       int ret = 0;
-       ssize_t size;
-       char *names = NULL, *end_names, *name, *value = NULL;
-       unsigned int setxattr_ENOTSUP = 0;
-
-       size = sys_listxattr(src_path, NULL, 0);
-       if (size < 0) {
-               if (errno != ENOSYS && errno != ENOTSUP) {
-                       ret = -1;
-               }
-               goto getout;
-       }
-       names = malloc(size+1);
-       if (names == NULL) {
-               ret = -1;
-               goto getout;
-       }
-       size = sys_listxattr(src_path, names, size);
-       if (size < 0) {
-               ret = -1;
-               goto getout;
-       } else {
-               names[size] = '\0';
-               end_names = names + size;
-       }
-
-       for (name = names; name != end_names; name = strchr(name, '\0') + 1) {
-               void *old_value;
-
-               /* check if this attribute shall be preserved */
-               if (!*name)
-                       continue;
-
-               size = sys_getxattr (src_path, name, NULL, 0);
-               if (size < 0) {
-                       ret = -1;
-                       continue;
-               }
-               value = realloc(old_value = value, size);
-               if (size != 0 && value == NULL) {
-                       free(old_value);
-                       ret = -1;
-               }
-               size = sys_getxattr(src_path, name, value, size);
-               if (size < 0) {
-                       ret = -1;
-                       continue;
-               }
-               if (sys_setxattr(dst_path, name, value, size, 0) != 0) {
-                       if (errno == ENOTSUP)
-                               setxattr_ENOTSUP++;
-                       else {
-                               if (errno == ENOSYS) {
-                                       ret = -1;
-                                       /* no hope of getting any further */
-                                       break;
-                               } else {
-                                       ret = -1;
-                               }
-                       }
-               }
-       }
-       if (setxattr_ENOTSUP) {
-               errno = ENOTSUP;
-               ret = -1;
-       }
-getout:
-       free(value);
-       free(names);
-       return ret;
-#else
-       /* FIXME same for solaris */
-       return 0;
-#endif
-}
-
 /**************************************************************************
  helper functions for Solaris' EA support
 ****************************************************************************/
@@ -784,7 +701,6 @@ 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)
 {
        ssize_t len = 0;
-       int stop = 0;
        DIR *dirp;
        struct dirent *de;
        int newfd = dup(attrdirfd);
@@ -843,6 +759,7 @@ static int solaris_attropen(const char *path, const char *attrpath, int oflag, m
        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));
+        errno = ENOATTR;
        }
        return filedes;
 }
@@ -865,5 +782,6 @@ static int solaris_write_xattr(int attrfd, const char *value, size_t size)
                return -1;
        }
 }
+
 #endif /*HAVE_ATTROPEN*/