Commit 325bf192 authored by Paul Eggert's avatar Paul Eggert

Merge from gnulib

This incorporates:
2015-06-06 acl-permissions: pacify -Wsuggest-attribute=const
2015-06-05 stdio: Don't redefine gets when using C++
2015-06-05 acl-permissions: port to AIX, C89 HP-UX
2015-06-02 file-has-acl: fix build on Mac OS X 10
2015-06-01 gnulib-tool: concatenate lib_SOURCES to a single line
2015-06-01 pthread_sigmask: discount system version if a simple macro
2015-05-31 readlinkat: avoid OS X 10.10 trailing slash bug
* doc/misc/texinfo.tex, lib/acl-internal.h, lib/get-permissions.c:
* lib/readlinkat.c, lib/set-permissions.c, lib/stdio.in.h:
* m4/acl.m4, m4/pthread_sigmask.m4, m4/readlinkat.m4: Copy from gnulib.
* lib/gnulib.mk: Regenerate.
parent 6fec047e
......@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
\def\texinfoversion{2015-05-26.15}
\def\texinfoversion{2015-06-01.15}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
......@@ -304,6 +304,7 @@
% Avoid "undefined control sequence" errors.
\def\lastchapterdefs{}
\def\lastsectiondefs{}
\def\lastsection{}
\def\prevchapterdefs{}
\def\prevsectiondefs{}
\def\lastcolordefs{}
......@@ -7607,7 +7608,7 @@
\long\def\nillm@{\nil@}%
% This macro is expanded during the Texinfo macro expansion, not during its
% definition. It gets all the arguments values and assigns them to macros
% definition. It gets all the arguments' values and assigns them to macros
% macarg.ARGNAME
%
% #1 is the macro name
......
......@@ -289,6 +289,10 @@ struct permission_context {
int get_permissions (const char *, int, mode_t, struct permission_context *);
int set_permissions (struct permission_context *, const char *, int);
void free_permission_context (struct permission_context *);
void free_permission_context (struct permission_context *)
#if ! (defined USE_ACL && (HAVE_ACL_GET_FILE || defined GETACL))
_GL_ATTRIBUTE_CONST
#endif
;
_GL_INLINE_HEADER_END
......@@ -33,7 +33,7 @@ int
get_permissions (const char *name, int desc, mode_t mode,
struct permission_context *ctx)
{
memset (ctx, 0, sizeof(*ctx));
memset (ctx, 0, sizeof *ctx);
ctx->mode = mode;
#if USE_ACL && HAVE_ACL_GET_FILE
......@@ -215,6 +215,7 @@ get_permissions (const char *name, int desc, mode_t mode,
#elif USE_ACL && HAVE_GETACL /* HP-UX */
{
int ret;
if (desc != -1)
......@@ -247,6 +248,7 @@ get_permissions (const char *name, int desc, mode_t mode,
abort ();
ctx->aclv_count = ret;
# endif
}
#elif USE_ACL && HAVE_ACLX_GET && ACL_AIX_WIP /* AIX */
......@@ -254,24 +256,27 @@ get_permissions (const char *name, int desc, mode_t mode,
#elif USE_ACL && HAVE_STATACL /* older AIX */
{
int ret;
if (desc != -1)
ret = fstatacl (desc, STX_NORMAL, &ctx->u.a, sizeof (ctx->u));
ret = fstatacl (desc, STX_NORMAL, &ctx->u.a, sizeof ctx->u);
else
ret = statacl (name, STX_NORMAL, &ctx->u.a, sizeof (ctx->u));
ret = statacl ((char *) name, STX_NORMAL, &ctx->u.a, sizeof ctx->u);
if (ret == 0)
ctx->have_u = true;
}
#elif USE_ACL && HAVE_ACLSORT /* NonStop Kernel */
int ret;
ret = acl ((char *) name, ACL_GET, NACLENTRIES, ctx->entries);
{
int ret = acl ((char *) name, ACL_GET, NACLENTRIES, ctx->entries);
if (ret < 0)
return -1;
else if (ret > NACLENTRIES)
/* If NACLENTRIES cannot be trusted, use dynamic memory allocation. */
abort ();
ctx->count = ret;
}
#endif
......
......@@ -44,8 +44,7 @@ HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
## begin gnulib module acl-permissions
libgnu_a_SOURCES += acl-errno-valid.c acl-internal.c \
get-permissions.c set-permissions.c
libgnu_a_SOURCES += acl-errno-valid.c acl-internal.c get-permissions.c set-permissions.c
EXTRA_DIST += acl-internal.h acl.h acl_entries.c
......
......@@ -18,7 +18,10 @@
#include <config.h>
#include <errno.h>
#include <unistd.h>
#include <string.h>
#include <sys/stat.h>
#if HAVE_READLINKAT
......@@ -27,6 +30,21 @@
ssize_t
rpl_readlinkat (int fd, char const *file, char *buf, size_t len)
{
# if READLINK_TRAILING_SLASH_BUG
size_t file_len = strlen (file);
if (file_len && file[file_len - 1] == '/')
{
/* Even if FILE without the slash is a symlink to a directory,
both lstat() and stat() must resolve the trailing slash to
the directory rather than the symlink. We can therefore
safely use stat() to distinguish between EINVAL and
ENOTDIR/ENOENT, avoiding extra overhead of rpl_lstat(). */
struct stat st;
if (stat (file, &st) == 0)
errno = EINVAL;
return -1;
}
# endif /* READLINK_TRAILING_SLASH_BUG */
return readlinkat (fd, file, buf, len);
}
......
......@@ -699,7 +699,7 @@ set_acls (struct permission_context *ctx, const char *name, int desc,
if (desc != -1)
ret = fchacl (desc, &ctx->u.a, ctx->u.a.acl_len);
else
ret = chacl (name, &ctx->u.a, ctx->u.a.acl_len);
ret = chacl ((char *) name, &ctx->u.a, ctx->u.a.acl_len);
if (ret < 0)
{
if (errno == ENOSYS && from_mode)
......
......@@ -723,11 +723,10 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
so any use of gets warrants an unconditional warning; besides, C11
removed it. */
#undef gets
#if HAVE_RAW_DECL_GETS
#if HAVE_RAW_DECL_GETS && !defined __cplusplus
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
#endif
#if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
struct obstack;
/* Grow an obstack with formatted output. Return the number of
......
# acl.m4 - check for access control list (ACL) primitives
# serial 20
# serial 21
# Copyright (C) 2002, 2004-2015 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
......@@ -181,12 +181,26 @@ AC_DEFUN([gl_FILE_HAS_ACL],
[
AC_REQUIRE([gl_FUNC_ACL_ARG])
if test "$enable_acl" != no; then
AC_CHECK_HEADERS([linux/xattr.h])
AC_CHECK_HEADERS([sys/xattr.h],
[AC_CHECK_FUNCS([getxattr])])
AC_CACHE_CHECK([for getxattr with XATTR_NAME_POSIX_ACL macros],
[gl_cv_getxattr_with_posix_acls],
[gl_cv_getxattr_with_posix_acls=no
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[#include <sys/types.h>
#include <sys/xattr.h>
#include <linux/xattr.h>
]],
[[ssize_t a = getxattr (".", XATTR_NAME_POSIX_ACL_ACCESS, 0, 0);
ssize_t b = getxattr (".", XATTR_NAME_POSIX_ACL_DEFAULT, 0, 0);
return a < 0 || b < 0;
]])],
[gl_cv_getxattr_with_posix_acls=yes])])
fi
if test "$ac_cv_header_sys_xattr_h,$ac_cv_func_getxattr" = yes,yes; then
if test "$gl_cv_getxattr_with_posix_acls" = yes; then
LIB_HAS_ACL=
AC_DEFINE([GETXATTR_WITH_POSIX_ACLS], 1,
[Define to 1 if getxattr works with XATTR_NAME_POSIX_ACL_ACCESS
and XATTR_NAME_POSIX_ACL_DEFAULT.])
else
dnl Set gl_need_lib_has_acl to a nonempty value, so that any
dnl later gl_FUNC_ACL call will set LIB_HAS_ACL=$LIB_ACL.
......
# pthread_sigmask.m4 serial 15
# pthread_sigmask.m4 serial 16
dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
......@@ -39,6 +39,30 @@ AC_DEFUN([gl_FUNC_PTHREAD_SIGMASK],
[gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=no])
LIBS="$gl_save_LIBS"
])
if test $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD = yes; then
AC_CACHE_CHECK([whether pthread_sigmask is only a macro],
[gl_cv_func_pthread_sigmask_is_macro],
[gl_save_LIBS="$LIBS"
LIBS="$LIBS $LIBMULTITHREAD"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[#include <pthread.h>
#include <signal.h>
#undef pthread_sigmask
]],
[[return pthread_sigmask (0, (sigset_t *) 0, (sigset_t *) 0);]])
],
[gl_cv_func_pthread_sigmask_is_macro=no],
[gl_cv_func_pthread_sigmask_is_macro=yes])
LIBS="$gl_save_LIBS"
])
if test $gl_cv_func_pthread_sigmask_is_macro = yes; then
dnl On MinGW pthread_sigmask is just a macro which always returns 0.
dnl It does not exist as a real function, which is required by POSIX.
REPLACE_PTHREAD_SIGMASK=1
gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=no
fi
fi
if test $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD = yes; then
dnl pthread_sigmask is available with -pthread or -lpthread.
LIB_PTHREAD_SIGMASK="$LIBMULTITHREAD"
......
# serial 4
# serial 5
# See if we need to provide readlinkat replacement.
dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
......@@ -13,6 +13,7 @@ AC_DEFUN([gl_FUNC_READLINKAT],
AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
AC_CHECK_FUNCS_ONCE([readlinkat])
AC_REQUIRE([gl_FUNC_READLINK])
if test $ac_cv_func_readlinkat = no; then
HAVE_READLINKAT=0
else
......@@ -25,8 +26,17 @@ AC_DEFUN([gl_FUNC_READLINKAT],
ssize_t readlinkat (int, char const *, char *, size_t);]])],
[gl_cv_decl_readlinkat_works=yes],
[gl_cv_decl_readlinkat_works=no])])
if test "$gl_cv_decl_readlink_works" != yes; then
# Assume readinkat has the same trailing slash bug as readlink,
# as is the case on Mac Os X 10.10
case "$gl_cv_func_readlink_works" in
*yes)
if test "$gl_cv_decl_readlinkat_works" != yes; then
REPLACE_READLINKAT=1
fi
;;
*)
REPLACE_READLINKAT=1
;;
esac
fi
])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment