Use Gnulib ACL implementation, for benefit of Solaris etc.
* configure.ac: Remove -with-acl option, since Gnulib does that for
us now.
(LIBACL_LIBS): Remove; no longer needed.
* lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros,
for the benefit of the new ACL implementation.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O).
($(BLD)/acl-errno-valid.$(O)): New rule.
* lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h:
* lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c:
* lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4:
New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* admin/merge-gnulib (GNULIB_MODULES): Add qacl.
(GNULIB_TOOL_FLAGS): Do not avoid errno.
* etc/NEWS: Emacs is no longer limited to POSIX ACLs. --disable-acl,
not --without-acl, since we're now using Gnulib's implementation.
* nt/config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL.
* nt/inc/ms-w32.h (EOPNOTSUPP): New macro.
* src/Makefile.in (LIB_ACL): New macro.
(LIBACL_LIBS): Remove.
(LIBES): Use LIB_ACL, not LIBACL_LIBS.
* src/fileio.c: Include <acl.h>.
Use HAVE_ACL_SET_FILE rather than HAVE_POSIX_ACL.
(ACL_NOT_WELL_SUPPORTED): Remove. All uses replaced by
!acl_errno_valid.
(Fcopy_file) [!WINDOWSNT]: Use qcopy_acl instead of rolling
it ourselves.
Fixes: debbugs:14295
2013-05-07 14:34:03 -07:00
|
|
|
/* Return the number of entries in an ACL.
|
|
|
|
|
2014-01-01 07:43:34 +00:00
|
|
|
Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
|
Use Gnulib ACL implementation, for benefit of Solaris etc.
* configure.ac: Remove -with-acl option, since Gnulib does that for
us now.
(LIBACL_LIBS): Remove; no longer needed.
* lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros,
for the benefit of the new ACL implementation.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O).
($(BLD)/acl-errno-valid.$(O)): New rule.
* lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h:
* lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c:
* lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4:
New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* admin/merge-gnulib (GNULIB_MODULES): Add qacl.
(GNULIB_TOOL_FLAGS): Do not avoid errno.
* etc/NEWS: Emacs is no longer limited to POSIX ACLs. --disable-acl,
not --without-acl, since we're now using Gnulib's implementation.
* nt/config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL.
* nt/inc/ms-w32.h (EOPNOTSUPP): New macro.
* src/Makefile.in (LIB_ACL): New macro.
(LIBACL_LIBS): Remove.
(LIBES): Use LIB_ACL, not LIBACL_LIBS.
* src/fileio.c: Include <acl.h>.
Use HAVE_ACL_SET_FILE rather than HAVE_POSIX_ACL.
(ACL_NOT_WELL_SUPPORTED): Remove. All uses replaced by
!acl_errno_valid.
(Fcopy_file) [!WINDOWSNT]: Use qcopy_acl instead of rolling
it ourselves.
Fixes: debbugs:14295
2013-05-07 14:34:03 -07:00
|
|
|
|
|
|
|
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-internal.h"
|
|
|
|
|
|
|
|
/* This file assumes POSIX-draft like ACLs
|
|
|
|
(Linux, FreeBSD, Mac OS X, IRIX, Tru64). */
|
|
|
|
|
|
|
|
/* Return the number of entries in ACL.
|
|
|
|
Return -1 and set errno upon failure to determine it. */
|
|
|
|
|
|
|
|
int
|
|
|
|
acl_entries (acl_t acl)
|
|
|
|
{
|
|
|
|
int count = 0;
|
|
|
|
|
|
|
|
if (acl != NULL)
|
|
|
|
{
|
|
|
|
#if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD, Mac OS X */
|
|
|
|
# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
|
|
|
|
/* acl_get_entry returns 0 when it successfully fetches an entry,
|
|
|
|
and -1/EINVAL at the end. */
|
|
|
|
acl_entry_t ace;
|
|
|
|
int got_one;
|
|
|
|
|
|
|
|
for (got_one = acl_get_entry (acl, ACL_FIRST_ENTRY, &ace);
|
|
|
|
got_one >= 0;
|
|
|
|
got_one = acl_get_entry (acl, ACL_NEXT_ENTRY, &ace))
|
|
|
|
count++;
|
|
|
|
# else /* Linux, FreeBSD */
|
|
|
|
/* acl_get_entry returns 1 when it successfully fetches an entry,
|
|
|
|
and 0 at the end. */
|
|
|
|
acl_entry_t ace;
|
|
|
|
int got_one;
|
|
|
|
|
|
|
|
for (got_one = acl_get_entry (acl, ACL_FIRST_ENTRY, &ace);
|
|
|
|
got_one > 0;
|
|
|
|
got_one = acl_get_entry (acl, ACL_NEXT_ENTRY, &ace))
|
|
|
|
count++;
|
|
|
|
if (got_one < 0)
|
|
|
|
return -1;
|
|
|
|
# endif
|
|
|
|
#else /* IRIX, Tru64 */
|
|
|
|
# if HAVE_ACL_TO_SHORT_TEXT /* IRIX */
|
|
|
|
/* Don't use acl_get_entry: it is undocumented. */
|
|
|
|
count = acl->acl_cnt;
|
|
|
|
# endif
|
|
|
|
# if HAVE_ACL_FREE_TEXT /* Tru64 */
|
|
|
|
/* Don't use acl_get_entry: it takes only one argument and does not
|
|
|
|
work. */
|
|
|
|
count = acl->acl_num;
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|