Rename acl.c to set-mode-acl.c.

diff --git a/ChangeLog b/ChangeLog
index 3e2088c7226f45b11022bd1da4cc5911e9e4e78f..bce4d1204d8a57b2f7b42ee6ab054080d0bb6b2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-25  Bruno Haible  <bruno@clisp.org>
+
+       * lib/set-mode-acl.c: Renamed from lib/acl.c.
+       * modules/acl (Files): Add lib/set-mode-acl.c, remove lib/acl.c.
+       (Makefile.am): Update lib_SOURCES.
+
 2008-05-25  Bruno Haible  <bruno@clisp.org>
 
        * m4/acl.m4 (gl_FUNC_ACL): Don't set LIB_ACL_TRIVIAL.

diff --git a/lib/acl.c b/lib/acl.c
deleted file mode 100644 (file)
index a164f0c..0000000
--- a/lib/acl.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/* acl.c - access control lists
-
-   Copyright (C) 2002-2003, 2005-2008 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   Written by Paul Eggert and Andreas Gruenbacher.  */
-
-#include <config.h>
-
-#include "acl.h"
-
-#include "acl-internal.h"
-
-/* If DESC is a valid file descriptor use fchmod to change the
-   file's mode to MODE on systems that have fchown. On systems
-   that don't have fchown and if DESC is invalid, use chown on
-   NAME instead.  */
-
-int
-chmod_or_fchmod (const char *name, int desc, mode_t mode)
-{
-  if (HAVE_FCHMOD && desc != -1)
-    return fchmod (desc, mode);
-  else
-    return chmod (name, mode);
-}
-
-/* Set the access control lists of a file. If DESC is a valid file
-   descriptor, use file descriptor operations where available, else use
-   filename based operations on 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.  */
-
-int
-qset_acl (char const *name, int desc, mode_t mode)
-{
-#if USE_ACL
-# if MODE_INSIDE_ACL
-#  if HAVE_ACL_SET_FILE && HAVE_ACL_FREE
-  /* POSIX 1003.1e draft 17 (abandoned) specific version.  */
-  /* Linux, FreeBSD, IRIX, Tru64 */
-
-  /* We must also have acl_from_text and acl_delete_def_file.
-     (acl_delete_def_file could be emulated with acl_init followed
-      by acl_set_file, but acl_set_file with an empty acl is
-      unspecified.)  */
-
-#   ifndef HAVE_ACL_FROM_TEXT
-#    error Must have acl_from_text (see POSIX 1003.1e draft 17).
-#   endif
-#   ifndef HAVE_ACL_DELETE_DEF_FILE
-#    error Must have acl_delete_def_file (see POSIX 1003.1e draft 17).
-#   endif
-
-  acl_t acl;
-  int ret;
-
-  if (HAVE_ACL_FROM_MODE) /* Linux */
-    {
-      acl = acl_from_mode (mode);
-      if (!acl)
-       return -1;
-    }
-  else /* FreeBSD, IRIX, Tru64 */
-    {
-      /* If we were to create the ACL using the functions acl_init(),
-        acl_create_entry(), acl_set_tag_type(), acl_set_qualifier(),
-        acl_get_permset(), acl_clear_perm[s](), acl_add_perm(), we
-        would need to create a qualifier.  I don't know how to do this.
-        So create it using acl_from_text().  */
-
-#   if HAVE_ACL_FREE_TEXT /* Tru64 */
-      char acl_text[] = "u::---,g::---,o::---,";
-#   else /* FreeBSD, IRIX */
-      char acl_text[] = "u::---,g::---,o::---";
-#   endif
-
-      if (mode & S_IRUSR) acl_text[ 3] = 'r';
-      if (mode & S_IWUSR) acl_text[ 4] = 'w';
-      if (mode & S_IXUSR) acl_text[ 5] = 'x';
-      if (mode & S_IRGRP) acl_text[10] = 'r';
-      if (mode & S_IWGRP) acl_text[11] = 'w';
-      if (mode & S_IXGRP) acl_text[12] = 'x';
-      if (mode & S_IROTH) acl_text[17] = 'r';
-      if (mode & S_IWOTH) acl_text[18] = 'w';
-      if (mode & S_IXOTH) acl_text[19] = 'x';
-
-      acl = acl_from_text (acl_text);
-      if (!acl)
-       return -1;
-    }
-  if (HAVE_ACL_SET_FD && desc != -1)
-    ret = acl_set_fd (desc, acl);
-  else
-    ret = acl_set_file (name, ACL_TYPE_ACCESS, acl);
-  if (ret != 0)
-    {
-      int saved_errno = errno;
-      acl_free (acl);
-
-      if (ACL_NOT_WELL_SUPPORTED (errno))
-       {
-         if (chmod_or_fchmod (name, desc, mode) != 0)
-           saved_errno = errno;
-         else
-           return 0;
-       }
-      errno = saved_errno;
-      return -1;
-    }
-  else
-    acl_free (acl);
-
-  if (S_ISDIR (mode) && acl_delete_def_file (name))
-    return -1;
-
-  if (mode & (S_ISUID | S_ISGID | S_ISVTX))
-    {
-      /* We did not call chmod so far, so the special bits have not yet
-         been set.  */
-
-      if (chmod_or_fchmod (name, desc, mode))
-       return -1;
-    }
-  return 0;
-
-#  elif defined ACL_NO_TRIVIAL
-  /* Solaris 10, with NFSv4 ACLs.  */
-  acl_t *aclp;
-  char acl_text[] = "user::---,group::---,mask:---,other:---";
-
-  if (mode & S_IRUSR) acl_text[ 6] = 'r';
-  if (mode & S_IWUSR) acl_text[ 7] = 'w';
-  if (mode & S_IXUSR) acl_text[ 8] = 'x';
-  if (mode & S_IRGRP) acl_text[17] = acl_text[26] = 'r';
-  if (mode & S_IWGRP) acl_text[18] = acl_text[27] = 'w';
-  if (mode & S_IXGRP) acl_text[19] = acl_text[28] = 'x';
-  if (mode & S_IROTH) acl_text[36] = 'r';
-  if (mode & S_IWOTH) acl_text[37] = 'w';
-  if (mode & S_IXOTH) acl_text[38] = 'x';
-
-  if (acl_fromtext (acl_text, &aclp) != 0)
-    {
-      errno = ENOMEM;
-      return -1;
-    }
-  else
-    {
-      int acl_result = (desc < 0 ? acl_set (name, aclp) : facl_set (desc, aclp));
-      int acl_errno = errno;
-      acl_free (aclp);
-      if (acl_result == 0 || acl_errno != ENOSYS)
-       {
-         errno = acl_errno;
-         return acl_result;
-       }
-    }
-
-  return chmod_or_fchmod (name, desc, mode);
-
-#  else /* Unknown flavor of ACLs */
-  return chmod_or_fchmod (name, desc, mode);
-#  endif
-# else /* !MODE_INSIDE_ACL */
-#  if HAVE_ACL_SET_FILE && HAVE_ACL_FREE
-  /* POSIX 1003.1e draft 17 (abandoned) specific version.  */
-  /* MacOS X */
-
-  acl_t acl;
-  int ret;
-
-  /* Remove the ACL if the file has ACLs.  */
-  if (HAVE_ACL_GET_FD && desc != -1)
-    acl = acl_get_fd (desc);
-  else
-    acl = acl_get_file (name, ACL_TYPE_ACCESS);
-  if (acl)
-    {
-#   if HAVE_ACL_COPY_EXT_NATIVE && HAVE_ACL_CREATE_ENTRY_NP /* MacOS X */
-      static const char empty_acl_text[] = "!#acl 1\n";
-#   else /* Unknown flavor of POSIX-like ACLs */
-#    error Unknown flavor of POSIX-like ACLs - add support for your platform.
-#   endif
-
-      acl = acl_from_text (empty_acl_text);
-      if (acl)
-       {
-         if (HAVE_ACL_SET_FD && desc != -1)
-           ret = acl_set_fd (desc, acl);
-         else
-           ret = acl_set_file (name, ACL_TYPE_ACCESS, acl);
-         if (ret != 0)
-           {
-             int saved_errno = errno;
-
-             acl_free (acl);
-
-             if (ACL_NOT_WELL_SUPPORTED (saved_errno))
-               {
-                 if (chmod_or_fchmod (name, desc, mode) != 0)
-                   saved_errno = errno;
-                 else
-                   return 0;
-               }
-             errno = saved_errno;
-             return -1;
-           }
-       }
-    }
-
-  return chmod_or_fchmod (name, desc, mode);
-#  else /* Unknown flavor of ACLs */
-  return chmod_or_fchmod (name, desc, mode);
-#  endif
-# endif
-#else /* !USE_ACL */
-  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/set-mode-acl.c b/lib/set-mode-acl.c
new file mode 100644 (file)
index 0000000..2aaa0e6
--- /dev/null
+++ b/lib/set-mode-acl.c
@@ -0,0 +1,244 @@
+/* set-mode-acl.c - set access control list equivalent to a mode
+
+   Copyright (C) 2002-2003, 2005-2008 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+   Written by Paul Eggert and Andreas Gruenbacher.  */
+
+#include <config.h>
+
+#include "acl.h"
+
+#include "acl-internal.h"
+
+/* If DESC is a valid file descriptor use fchmod to change the
+   file's mode to MODE on systems that have fchown. On systems
+   that don't have fchown and if DESC is invalid, use chown on
+   NAME instead.  */
+
+int
+chmod_or_fchmod (const char *name, int desc, mode_t mode)
+{
+  if (HAVE_FCHMOD && desc != -1)
+    return fchmod (desc, mode);
+  else
+    return chmod (name, mode);
+}
+
+/* Set the access control lists of a file. If DESC is a valid file
+   descriptor, use file descriptor operations where available, else use
+   filename based operations on 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.  */
+
+int
+qset_acl (char const *name, int desc, mode_t mode)
+{
+#if USE_ACL
+# if MODE_INSIDE_ACL
+#  if HAVE_ACL_SET_FILE && HAVE_ACL_FREE
+  /* POSIX 1003.1e draft 17 (abandoned) specific version.  */
+  /* Linux, FreeBSD, IRIX, Tru64 */
+
+  /* We must also have acl_from_text and acl_delete_def_file.
+     (acl_delete_def_file could be emulated with acl_init followed
+      by acl_set_file, but acl_set_file with an empty acl is
+      unspecified.)  */
+
+#   ifndef HAVE_ACL_FROM_TEXT
+#    error Must have acl_from_text (see POSIX 1003.1e draft 17).
+#   endif
+#   ifndef HAVE_ACL_DELETE_DEF_FILE
+#    error Must have acl_delete_def_file (see POSIX 1003.1e draft 17).
+#   endif
+
+  acl_t acl;
+  int ret;
+
+  if (HAVE_ACL_FROM_MODE) /* Linux */
+    {
+      acl = acl_from_mode (mode);
+      if (!acl)
+       return -1;
+    }
+  else /* FreeBSD, IRIX, Tru64 */
+    {
+      /* If we were to create the ACL using the functions acl_init(),
+        acl_create_entry(), acl_set_tag_type(), acl_set_qualifier(),
+        acl_get_permset(), acl_clear_perm[s](), acl_add_perm(), we
+        would need to create a qualifier.  I don't know how to do this.
+        So create it using acl_from_text().  */
+
+#   if HAVE_ACL_FREE_TEXT /* Tru64 */
+      char acl_text[] = "u::---,g::---,o::---,";
+#   else /* FreeBSD, IRIX */
+      char acl_text[] = "u::---,g::---,o::---";
+#   endif
+
+      if (mode & S_IRUSR) acl_text[ 3] = 'r';
+      if (mode & S_IWUSR) acl_text[ 4] = 'w';
+      if (mode & S_IXUSR) acl_text[ 5] = 'x';
+      if (mode & S_IRGRP) acl_text[10] = 'r';
+      if (mode & S_IWGRP) acl_text[11] = 'w';
+      if (mode & S_IXGRP) acl_text[12] = 'x';
+      if (mode & S_IROTH) acl_text[17] = 'r';
+      if (mode & S_IWOTH) acl_text[18] = 'w';
+      if (mode & S_IXOTH) acl_text[19] = 'x';
+
+      acl = acl_from_text (acl_text);
+      if (!acl)
+       return -1;
+    }
+  if (HAVE_ACL_SET_FD && desc != -1)
+    ret = acl_set_fd (desc, acl);
+  else
+    ret = acl_set_file (name, ACL_TYPE_ACCESS, acl);
+  if (ret != 0)
+    {
+      int saved_errno = errno;
+      acl_free (acl);
+
+      if (ACL_NOT_WELL_SUPPORTED (errno))
+       {
+         if (chmod_or_fchmod (name, desc, mode) != 0)
+           saved_errno = errno;
+         else
+           return 0;
+       }
+      errno = saved_errno;
+      return -1;
+    }
+  else
+    acl_free (acl);
+
+  if (S_ISDIR (mode) && acl_delete_def_file (name))
+    return -1;
+
+  if (mode & (S_ISUID | S_ISGID | S_ISVTX))
+    {
+      /* We did not call chmod so far, so the special bits have not yet
+         been set.  */
+
+      if (chmod_or_fchmod (name, desc, mode))
+       return -1;
+    }
+  return 0;
+
+#  elif defined ACL_NO_TRIVIAL
+  /* Solaris 10, with NFSv4 ACLs.  */
+  acl_t *aclp;
+  char acl_text[] = "user::---,group::---,mask:---,other:---";
+
+  if (mode & S_IRUSR) acl_text[ 6] = 'r';
+  if (mode & S_IWUSR) acl_text[ 7] = 'w';
+  if (mode & S_IXUSR) acl_text[ 8] = 'x';
+  if (mode & S_IRGRP) acl_text[17] = acl_text[26] = 'r';
+  if (mode & S_IWGRP) acl_text[18] = acl_text[27] = 'w';
+  if (mode & S_IXGRP) acl_text[19] = acl_text[28] = 'x';
+  if (mode & S_IROTH) acl_text[36] = 'r';
+  if (mode & S_IWOTH) acl_text[37] = 'w';
+  if (mode & S_IXOTH) acl_text[38] = 'x';
+
+  if (acl_fromtext (acl_text, &aclp) != 0)
+    {
+      errno = ENOMEM;
+      return -1;
+    }
+  else
+    {
+      int acl_result = (desc < 0 ? acl_set (name, aclp) : facl_set (desc, aclp));
+      int acl_errno = errno;
+      acl_free (aclp);
+      if (acl_result == 0 || acl_errno != ENOSYS)
+       {
+         errno = acl_errno;
+         return acl_result;
+       }
+    }
+
+  return chmod_or_fchmod (name, desc, mode);
+
+#  else /* Unknown flavor of ACLs */
+  return chmod_or_fchmod (name, desc, mode);
+#  endif
+# else /* !MODE_INSIDE_ACL */
+#  if HAVE_ACL_SET_FILE && HAVE_ACL_FREE
+  /* POSIX 1003.1e draft 17 (abandoned) specific version.  */
+  /* MacOS X */
+
+  acl_t acl;
+  int ret;
+
+  /* Remove the ACL if the file has ACLs.  */
+  if (HAVE_ACL_GET_FD && desc != -1)
+    acl = acl_get_fd (desc);
+  else
+    acl = acl_get_file (name, ACL_TYPE_ACCESS);
+  if (acl)
+    {
+#   if HAVE_ACL_COPY_EXT_NATIVE && HAVE_ACL_CREATE_ENTRY_NP /* MacOS X */
+      static const char empty_acl_text[] = "!#acl 1\n";
+#   else /* Unknown flavor of POSIX-like ACLs */
+#    error Unknown flavor of POSIX-like ACLs - add support for your platform.
+#   endif
+
+      acl = acl_from_text (empty_acl_text);
+      if (acl)
+       {
+         if (HAVE_ACL_SET_FD && desc != -1)
+           ret = acl_set_fd (desc, acl);
+         else
+           ret = acl_set_file (name, ACL_TYPE_ACCESS, acl);
+         if (ret != 0)
+           {
+             int saved_errno = errno;
+
+             acl_free (acl);
+
+             if (ACL_NOT_WELL_SUPPORTED (saved_errno))
+               {
+                 if (chmod_or_fchmod (name, desc, mode) != 0)
+                   saved_errno = errno;
+                 else
+                   return 0;
+               }
+             errno = saved_errno;
+             return -1;
+           }
+       }
+    }
+
+  return chmod_or_fchmod (name, desc, mode);
+#  else /* Unknown flavor of ACLs */
+  return chmod_or_fchmod (name, desc, mode);
+#  endif
+# endif
+#else /* !USE_ACL */
+  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/modules/acl b/modules/acl
index 9a7f277555cd4d5a58267191797335098a7e8ee5..8a004b5503b470b45350379b8dc142487b59ab98 100644 (file)
--- a/modules/acl
+++ b/modules/acl
@@ -3,9 +3,9 @@ Access control lists of files.  (Unportable.)
 
 Files:
 lib/acl.h
-lib/acl.c
 lib/acl-internal.h
 lib/acl_entries.c
+lib/set-mode-acl.c
 lib/copy-acl.c
 lib/file-has-acl.c
 m4/acl.m4
@@ -20,7 +20,7 @@ configure.ac:
 gl_FUNC_ACL
 
 Makefile.am:
-lib_SOURCES += acl.c copy-acl.c file-has-acl.c
+lib_SOURCES += set-mode-acl.c copy-acl.c file-has-acl.c
 
 Include:
 "acl.h"