projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xprintf fixes.
[gnulib.git]
/
lib
/
acl-internal.h
diff --git
a/lib/acl-internal.h
b/lib/acl-internal.h
index
e224a78
..
36b9ced
100644
(file)
--- a/
lib/acl-internal.h
+++ b/
lib/acl-internal.h
@@
-2,10
+2,10
@@
Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
- This program is free software
;
you can redistribute it and/or modify
+ 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
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ 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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,13
+13,10
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
Written by Paul Eggert and Andreas Gruenbacher. */
Written by Paul Eggert and Andreas Gruenbacher. */
-#include <config.h>
-
#include "acl.h"
#include <stdbool.h>
#include "acl.h"
#include <stdbool.h>
@@
-55,12
+52,14
@@
/* POSIX 1003.1e (draft 17) */
#ifndef HAVE_ACL_GET_FD
# define HAVE_ACL_GET_FD false
/* POSIX 1003.1e (draft 17) */
#ifndef HAVE_ACL_GET_FD
# define HAVE_ACL_GET_FD false
+# undef acl_get_fd
# define acl_get_fd(fd) (NULL)
#endif
/* POSIX 1003.1e (draft 17) */
#ifndef HAVE_ACL_SET_FD
# define HAVE_ACL_SET_FD false
# define acl_get_fd(fd) (NULL)
#endif
/* POSIX 1003.1e (draft 17) */
#ifndef HAVE_ACL_SET_FD
# define HAVE_ACL_SET_FD false
+# undef acl_set_fd
# define acl_set_fd(fd, acl) (-1)
#endif
# define acl_set_fd(fd, acl) (-1)
#endif
@@
-76,8
+75,8
@@
# define acl_from_mode(mode) (NULL)
#endif
# define acl_from_mode(mode) (NULL)
#endif
-#define ACL_NOT_WELL_SUPPORTED(Err
no
) \
- ((Err
no) == ENOTSUP || (Errno) == ENOSYS || (Errno) == EINVAL
)
+#define ACL_NOT_WELL_SUPPORTED(Err) \
+ ((Err
) == ENOTSUP || (Err) == ENOSYS || (Err) == EINVAL || (Err) == EBUSY
)
/* Define a replacement for acl_entries if needed. */
#if USE_ACL && HAVE_ACL_GET_FILE && HAVE_ACL_FREE && !HAVE_ACL_ENTRIES
/* Define a replacement for acl_entries if needed. */
#if USE_ACL && HAVE_ACL_GET_FILE && HAVE_ACL_FREE && !HAVE_ACL_ENTRIES