New function qset_acl, like set_acl but with syscall semantics.

* lib/acl.h (qset_acl): New decl.
* lib/acl.c (qset_acl): New function.
(set_acl): Use new function.  Use more-consistent diagnostics.

diff --git a/ChangeLog b/ChangeLog
index 14df121c889752668d1e72301d6a9fd21978f69e..b792a09910ba767bd58220700525c037ce0b12fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+       New function qset_acl, like set_acl but with syscall semantics.
+       * lib/acl.h (qset_acl): New decl.
+       * lib/acl.c (qset_acl): New function.
+       (set_acl): Use new function.  Use more-consistent diagnostics.
+
 2007-11-28  Jim Meyering  <meyering@redhat.com>
 
        * modules/physmem (License): Change from GPL to LGPLv2+.

diff --git a/lib/acl.c b/lib/acl.c
index 89d48d3bb576bbd9c5b0350490d0040c0e9125c0..5214c51c7568ab17c1e9a1cf1ac2565a22a2fc80 100644 (file)
--- a/lib/acl.c
+++ b/lib/acl.c
@@ -40,11 +40,11 @@ chmod_or_fchmod (const char *name, int desc, mode_t mode)
 /* Copy access control lists from one file to another. If SOURCE_DESC is
    a valid file descriptor, use file descriptor operations, else use
    filename based operations on SRC_NAME. Likewise for DEST_DESC and
-   DEST_NAME.
+   DST_NAME.
    If access control lists are not available, fchmod the target file to
    MODE.  Also sets the non-permission bits of the destination file
    (S_ISUID, S_ISGID, S_ISVTX) to those from MODE if any are set.
-   System call return value semantics.  */
+   Return 0 if successful, otherwise output a diagnostic and return -1.  */
 
 int
 copy_acl (const char *src_name, int source_desc, const char *dst_name,
@@ -161,7 +161,7 @@ copy_acl (const char *src_name, int source_desc, const char *dst_name,
    semantics.  */
 
 int
-set_acl (char const *name, int desc, mode_t mode)
+qset_acl (char const *name, int desc, mode_t mode)
 {
 #if USE_ACL && HAVE_ACL_SET_FILE && HAVE_ACL_FREE
   /* POSIX 1003.1e draft 17 (abandoned) specific version.  */
@@ -185,10 +185,7 @@ set_acl (char const *name, int desc, mode_t mode)
     {
       acl = acl_from_mode (mode);
       if (!acl)
-       {
-         error (0, errno, "%s", quote (name));
-         return -1;
-       }
+       return -1;
     }
   else
     {
@@ -206,10 +203,7 @@ set_acl (char const *name, int desc, mode_t mode)
 
       acl = acl_from_text (acl_text);
       if (!acl)
-       {
-         error (0, errno, "%s", quote (name));
-         return -1;
-       }
+       return -1;
     }
   if (HAVE_ACL_SET_FD && desc != -1)
     ret = acl_set_fd (desc, acl);
@@ -227,17 +221,14 @@ set_acl (char const *name, int desc, mode_t mode)
          else
            return 0;
        }
-      error (0, saved_errno, _("setting permissions for %s"), quote (name));
+      errno = saved_errno;
       return -1;
     }
   else
     acl_free (acl);
 
   if (S_ISDIR (mode) && acl_delete_def_file (name))
-    {
-      error (0, errno, _("setting permissions for %s"), quote (name));
-      return -1;
-    }
+    return -1;
 
   if (mode & (S_ISUID | S_ISGID | S_ISVTX))
     {
@@ -245,16 +236,21 @@ set_acl (char const *name, int desc, mode_t mode)
          been set.  */
 
       if (chmod_or_fchmod (name, desc, mode))
-       {
-         error (0, errno, _("preserving permissions for %s"), quote (name));
-         return -1;
-       }
+       return -1;
     }
   return 0;
 #else
-   int ret = chmod_or_fchmod (name, desc, mode);
-   if (ret)
-     error (0, errno, _("setting permissions for %s"), quote (name));
-   return ret;
+  return chmod_or_fchmod (name, desc, mode);
 #endif
 }
+
+/* As with qset_acl, but also output a diagnostic on failure.  */
+
+int
+set_acl (char const *name, int desc, mode_t mode)
+{
+  int r = qset_acl (name, desc, mode);
+  if (r != 0)
+    error (0, errno, _("setting permissions for %s"), quote (name));
+  return r;
+}

diff --git a/lib/acl.h b/lib/acl.h
index 34a788315f7f22c52c5040394887f760d3dd5089..00cc60d90d46dfa4499f6ea0461d07c73263086e 100644 (file)
--- a/lib/acl.h
+++ b/lib/acl.h
@@ -31,4 +31,5 @@
 int file_has_acl (char const *, struct stat const *);
 int copy_acl (char const *, int, char const *, int, mode_t);
 int set_acl (char const *, int, mode_t);
+int qset_acl (char const *, int, mode_t);
 int chmod_or_fchmod (char const *, int, mode_t);