[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110594: Undo faccessat change.
|
From: |
Paul Eggert |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110594: Undo faccessat change. |
|
Date: |
Fri, 19 Oct 2012 12:25:18 -0700 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110594
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2012-10-19 12:25:18 -0700
message:
Undo faccessat change.
removed:
lib/at-func.c
lib/euidaccess.c
lib/faccessat.c
lib/fcntl.in.h
lib/getgroups.c
lib/group-member.c
lib/root-uid.h
lib/xalloc-oversized.h
m4/euidaccess.m4
m4/faccessat.m4
m4/fcntl_h.m4
m4/getgroups.m4
m4/group-member.m4
modified:
.bzrignore
ChangeLog
admin/ChangeLog
admin/merge-gnulib
configure.ac
lib/gnulib.mk
m4/gnulib-comp.m4
nt/ChangeLog
nt/inc/ms-w32.h
src/ChangeLog
src/Makefile.in
src/callproc.c
src/charset.c
src/conf_post.h
src/fileio.c
src/lisp.h
src/lread.c
src/process.c
src/sysdep.c
src/term.c
src/w32.c
src/xrdb.c
=== modified file '.bzrignore'
--- a/.bzrignore 2012-10-19 16:52:02 +0000
+++ b/.bzrignore 2012-10-19 19:25:18 +0000
@@ -88,7 +88,6 @@
lib/arg-nonnull.h
lib/c++defs.h
lib/execinfo.h
-lib/fcntl.h
lib/getopt.h
lib/inttypes.h
lib/stdalign.h
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-10-19 16:52:02 +0000
+++ b/ChangeLog 2012-10-19 19:25:18 +0000
@@ -1,16 +1,3 @@
-2012-10-19 Paul Eggert <address@hidden>
-
- Use faccessat, not access, when checking file permissions (Bug#12632).
- * .bzrignore: Add lib/fcntl.h.
- * configure.ac (euidaccess): Remove check; gnulib does this for us now.
- (gl_FCNTL_O_FLAGS): Define a dummy version.
- * lib/at-func.c, lib/euidaccess.c, lib/faccessat.c, lib/fcntl.in.h:
- * lib/getgroups.c, lib/group-member.c, lib/root-uid.h:
- * lib/xalloc-oversized.h, m4/euidaccess.m4, m4/faccessat.m4:
- * m4/fcntl_h.m4, m4/getgroups.m4, m4/group-member.m4:
- New files, from gnulib.
- * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
-
2012-10-18 Stefan Monnier <address@hidden>
* Makefile.in ($(MAKEFILE_NAME)): Depend on src/lisp.mk as well.
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2012-10-19 16:52:02 +0000
+++ b/admin/ChangeLog 2012-10-19 19:25:18 +0000
@@ -1,11 +1,3 @@
-2012-10-19 Paul Eggert <address@hidden>
-
- Use faccessat, not access, when checking file permissions (Bug#12632).
- * merge-gnulib (GNULIB_MODULES): Add faccessat.
- (GNULIB_TOOL_FLAGS): Avoid at-internal, fchdir, malloc-posix,
- openat-die, openat-h, save-cwd. Do not avoid fcntl-h.
- Omit gnulib's m4/fcntl-o.m4.
-
2012-10-12 Kenichi Handa <address@hidden>
* charsets/Makefile (JISC6226.map): Add missing mappings.
=== modified file 'admin/merge-gnulib'
--- a/admin/merge-gnulib 2012-10-19 16:52:02 +0000
+++ b/admin/merge-gnulib 2012-10-19 19:25:18 +0000
@@ -28,7 +28,7 @@
GNULIB_MODULES='
alloca-opt c-ctype c-strcase
careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
- dtoastr dtotimespec dup2 environ execinfo faccessat
+ dtoastr dtotimespec dup2 environ execinfo
filemode getloadavg getopt-gnu gettime gettimeofday
ignore-value intprops largefile lstat
manywarnings mktime pselect pthread_sigmask readlink
@@ -39,12 +39,9 @@
'
GNULIB_TOOL_FLAGS='
- --avoid=at-internal
- --avoid=errno --avoid=fchdir --avoid=fcntl --avoid=fstat
- --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow
- --avoid=openat-die --avoid=openat-h
- --avoid=raise
- --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types
+ --avoid=errno --avoid=fcntl --avoid=fcntl-h --avoid=fstat
+ --avoid=msvc-inval --avoid=msvc-nothrow
+ --avoid=raise --avoid=select --avoid=sigprocmask --avoid=sys_types
--avoid=threadlib
--conditional-dependencies --import --no-changelog --no-vc-files
--makefile-name=gnulib.mk
@@ -88,7 +85,7 @@
}
"$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES &&
-rm -- "$src"m4/fcntl-o.m4 "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 &&
+rm -- "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 &&
cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux &&
autoreconf -i -I m4 -- ${src:+"$src"}
=== modified file 'configure.ac'
--- a/configure.ac 2012-10-19 16:52:02 +0000
+++ b/configure.ac 2012-10-19 19:25:18 +0000
@@ -572,8 +572,6 @@
test "x$NON_GCC_TEST_OPTIONS" != x && CC="$CC $NON_GCC_TEST_OPTIONS"
fi
-# Avoid gnulib's tests for O_NOATIME and O_NOFOLLOW, as we don't use them.
-AC_DEFUN([gl_FCNTL_O_FLAGS])
# Avoid gnulib's threadlib module, as we do threads our own way.
AC_DEFUN([gl_THREADLIB])
@@ -2874,7 +2872,7 @@
AC_CHECK_FUNCS(gethostname \
closedir getrusage get_current_dir_name \
lrand48 setsid \
-fpathconf select getpagesize setlocale \
+fpathconf select euidaccess getpagesize setlocale \
utimes getrlimit setrlimit setpgid getcwd shutdown getaddrinfo \
__fpending strsignal setitimer \
sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \
=== removed file 'lib/at-func.c'
--- a/lib/at-func.c 2012-10-19 17:14:00 +0000
+++ b/lib/at-func.c 1970-01-01 00:00:00 +0000
@@ -1,146 +0,0 @@
-/* Define at-style functions like fstatat, unlinkat, fchownat, etc.
- Copyright (C) 2006, 2009-2012 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 Jim Meyering */
-
-#include "dosname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */
-
-#ifdef GNULIB_SUPPORT_ONLY_AT_FDCWD
-# include <errno.h>
-# ifndef ENOTSUP
-# define ENOTSUP EINVAL
-# endif
-#else
-# include "openat.h"
-# include "openat-priv.h"
-# include "save-cwd.h"
-#endif
-
-#ifdef AT_FUNC_USE_F1_COND
-# define CALL_FUNC(F) \
- (flag == AT_FUNC_USE_F1_COND \
- ? AT_FUNC_F1 (F AT_FUNC_POST_FILE_ARGS) \
- : AT_FUNC_F2 (F AT_FUNC_POST_FILE_ARGS))
-# define VALIDATE_FLAG(F) \
- if (flag & ~AT_FUNC_USE_F1_COND) \
- { \
- errno = EINVAL; \
- return FUNC_FAIL; \
- }
-#else
-# define CALL_FUNC(F) (AT_FUNC_F1 (F AT_FUNC_POST_FILE_ARGS))
-# define VALIDATE_FLAG(F) /* empty */
-#endif
-
-#ifdef AT_FUNC_RESULT
-# define FUNC_RESULT AT_FUNC_RESULT
-#else
-# define FUNC_RESULT int
-#endif
-
-#ifdef AT_FUNC_FAIL
-# define FUNC_FAIL AT_FUNC_FAIL
-#else
-# define FUNC_FAIL -1
-#endif
-
-/* Call AT_FUNC_F1 to operate on FILE, which is in the directory
- open on descriptor FD. If AT_FUNC_USE_F1_COND is defined to a value,
- AT_FUNC_POST_FILE_PARAM_DECLS must include a parameter named flag;
- call AT_FUNC_F2 if FLAG is 0 or fail if FLAG contains more bits than
- AT_FUNC_USE_F1_COND. Return int and fail with -1 unless AT_FUNC_RESULT
- or AT_FUNC_FAIL are defined. If possible, do it without changing the
- working directory. Otherwise, resort to using save_cwd/fchdir,
- then AT_FUNC_F?/restore_cwd. If either the save_cwd or the restore_cwd
- fails, then give a diagnostic and exit nonzero. */
-FUNC_RESULT
-AT_FUNC_NAME (int fd, char const *file AT_FUNC_POST_FILE_PARAM_DECLS)
-{
- VALIDATE_FLAG (flag);
-
- if (fd == AT_FDCWD || IS_ABSOLUTE_FILE_NAME (file))
- return CALL_FUNC (file);
-
-#ifdef GNULIB_SUPPORT_ONLY_AT_FDCWD
- errno = ENOTSUP;
- return FUNC_FAIL;
-#else
- {
- /* Be careful to choose names unlikely to conflict with
- AT_FUNC_POST_FILE_PARAM_DECLS. */
- struct saved_cwd saved_cwd;
- int saved_errno;
- FUNC_RESULT err;
-
- {
- char proc_buf[OPENAT_BUFFER_SIZE];
- char *proc_file = openat_proc_name (proc_buf, fd, file);
- if (proc_file)
- {
- FUNC_RESULT proc_result = CALL_FUNC (proc_file);
- int proc_errno = errno;
- if (proc_file != proc_buf)
- free (proc_file);
- /* If the syscall succeeds, or if it fails with an unexpected
- errno value, then return right away. Otherwise, fall through
- and resort to using save_cwd/restore_cwd. */
- if (FUNC_FAIL != proc_result)
- return proc_result;
- if (! EXPECTED_ERRNO (proc_errno))
- {
- errno = proc_errno;
- return proc_result;
- }
- }
- }
-
- if (save_cwd (&saved_cwd) != 0)
- openat_save_fail (errno);
- if (0 <= fd && fd == saved_cwd.desc)
- {
- /* If saving the working directory collides with the user's
- requested fd, then the user's fd must have been closed to
- begin with. */
- free_cwd (&saved_cwd);
- errno = EBADF;
- return FUNC_FAIL;
- }
-
- if (fchdir (fd) != 0)
- {
- saved_errno = errno;
- free_cwd (&saved_cwd);
- errno = saved_errno;
- return FUNC_FAIL;
- }
-
- err = CALL_FUNC (file);
- saved_errno = (err == FUNC_FAIL ? errno : 0);
-
- if (restore_cwd (&saved_cwd) != 0)
- openat_restore_fail (errno);
-
- free_cwd (&saved_cwd);
-
- if (saved_errno)
- errno = saved_errno;
- return err;
- }
-#endif
-}
-#undef CALL_FUNC
-#undef FUNC_RESULT
-#undef FUNC_FAIL
=== removed file 'lib/euidaccess.c'
--- a/lib/euidaccess.c 2012-10-19 17:14:00 +0000
+++ b/lib/euidaccess.c 1970-01-01 00:00:00 +0000
@@ -1,221 +0,0 @@
-/* euidaccess -- check if effective user id can access file
-
- Copyright (C) 1990-1991, 1995, 1998, 2000, 2003-2006, 2008-2012 Free
- Software Foundation, Inc.
-
- This file is part of the GNU C Library.
-
- 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 David MacKenzie and Torbjorn Granlund.
- Adapted for GNU C library by Roland McGrath. */
-
-#ifndef _LIBC
-# include <config.h>
-#endif
-
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include "root-uid.h"
-
-#if HAVE_LIBGEN_H
-# include <libgen.h>
-#endif
-
-#include <errno.h>
-#ifndef __set_errno
-# define __set_errno(val) errno = (val)
-#endif
-
-#if defined EACCES && !defined EACCESS
-# define EACCESS EACCES
-#endif
-
-#ifndef F_OK
-# define F_OK 0
-# define X_OK 1
-# define W_OK 2
-# define R_OK 4
-#endif
-
-
-#ifdef _LIBC
-
-# define access __access
-# define getuid __getuid
-# define getgid __getgid
-# define geteuid __geteuid
-# define getegid __getegid
-# define group_member __group_member
-# define euidaccess __euidaccess
-# undef stat
-# define stat stat64
-
-#endif
-
-/* Return 0 if the user has permission of type MODE on FILE;
- otherwise, return -1 and set 'errno'.
- Like access, except that it uses the effective user and group
- id's instead of the real ones, and it does not always check for read-only
- file system, text busy, etc. */
-
-int
-euidaccess (const char *file, int mode)
-{
-#if HAVE_FACCESSAT /* glibc, AIX 7, Solaris 11, Cygwin 1.7 */
- return faccessat (AT_FDCWD, file, mode, AT_EACCESS);
-#elif defined EFF_ONLY_OK /* IRIX, OSF/1, Interix */
- return access (file, mode | EFF_ONLY_OK);
-#elif defined ACC_SELF /* AIX */
- return accessx (file, mode, ACC_SELF);
-#elif HAVE_EACCESS /* FreeBSD */
- return eaccess (file, mode);
-#else /* Mac OS X, NetBSD, OpenBSD, HP-UX, Solaris, Cygwin, mingw, BeOS
*/
-
- uid_t uid = getuid ();
- gid_t gid = getgid ();
- uid_t euid = geteuid ();
- gid_t egid = getegid ();
- struct stat stats;
-
-# if HAVE_DECL_SETREGID && PREFER_NONREENTRANT_EUIDACCESS
-
- /* Define PREFER_NONREENTRANT_EUIDACCESS if you prefer euidaccess to
- return the correct result even if this would make it
- nonreentrant. Define this only if your entire application is
- safe even if the uid or gid might temporarily change. If your
- application uses signal handlers or threads it is probably not
- safe. */
-
- if (mode == F_OK)
- return stat (file, &stats);
- else
- {
- int result;
- int saved_errno;
-
- if (uid != euid)
- setreuid (euid, uid);
- if (gid != egid)
- setregid (egid, gid);
-
- result = access (file, mode);
- saved_errno = errno;
-
- /* Restore them. */
- if (uid != euid)
- setreuid (uid, euid);
- if (gid != egid)
- setregid (gid, egid);
-
- errno = saved_errno;
- return result;
- }
-
-# else
-
- /* The following code assumes the traditional Unix model, and is not
- correct on systems that have ACLs or the like. However, it's
- better than nothing, and it is reentrant. */
-
- unsigned int granted;
- if (uid == euid && gid == egid)
- /* If we are not set-uid or set-gid, access does the same. */
- return access (file, mode);
-
- if (stat (file, &stats) != 0)
- return -1;
-
- /* The super-user can read and write any file, and execute any file
- that anyone can execute. */
- if (euid == ROOT_UID
- && ((mode & X_OK) == 0
- || (stats.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))))
- return 0;
-
- /* Convert the mode to traditional form, clearing any bogus bits. */
- if (R_OK == 4 && W_OK == 2 && X_OK == 1 && F_OK == 0)
- mode &= 7;
- else
- mode = ((mode & R_OK ? 4 : 0)
- + (mode & W_OK ? 2 : 0)
- + (mode & X_OK ? 1 : 0));
-
- if (mode == 0)
- return 0; /* The file exists. */
-
- /* Convert the file's permission bits to traditional form. */
- if (S_IRUSR == (4 << 6) && S_IWUSR == (2 << 6) && S_IXUSR == (1 << 6)
- && S_IRGRP == (4 << 3) && S_IWGRP == (2 << 3) && S_IXGRP == (1 << 3)
- && S_IROTH == (4 << 0) && S_IWOTH == (2 << 0) && S_IXOTH == (1 << 0))
- granted = stats.st_mode;
- else
- granted = ((stats.st_mode & S_IRUSR ? 4 << 6 : 0)
- + (stats.st_mode & S_IWUSR ? 2 << 6 : 0)
- + (stats.st_mode & S_IXUSR ? 1 << 6 : 0)
- + (stats.st_mode & S_IRGRP ? 4 << 3 : 0)
- + (stats.st_mode & S_IWGRP ? 2 << 3 : 0)
- + (stats.st_mode & S_IXGRP ? 1 << 3 : 0)
- + (stats.st_mode & S_IROTH ? 4 << 0 : 0)
- + (stats.st_mode & S_IWOTH ? 2 << 0 : 0)
- + (stats.st_mode & S_IXOTH ? 1 << 0 : 0));
-
- if (euid == stats.st_uid)
- granted >>= 6;
- else if (egid == stats.st_gid || group_member (stats.st_gid))
- granted >>= 3;
-
- if ((mode & ~granted) == 0)
- return 0;
- __set_errno (EACCESS);
- return -1;
-
-# endif
-#endif
-}
-#undef euidaccess
-#ifdef weak_alias
-weak_alias (__euidaccess, euidaccess)
-#endif
-
-#ifdef TEST
-# include <error.h>
-# include <stdio.h>
-# include <stdlib.h>
-
-char *program_name;
-
-int
-main (int argc, char **argv)
-{
- char *file;
- int mode;
- int err;
-
- program_name = argv[0];
- if (argc < 3)
- abort ();
- file = argv[1];
- mode = atoi (argv[2]);
-
- err = euidaccess (file, mode);
- printf ("%d\n", err);
- if (err != 0)
- error (0, errno, "%s", file);
- exit (0);
-}
-#endif
=== removed file 'lib/faccessat.c'
--- a/lib/faccessat.c 2012-10-19 17:14:00 +0000
+++ b/lib/faccessat.c 1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-/* Check the access rights of a file relative to an open directory.
- Copyright (C) 2009-2012 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 Eric Blake */
-
-#include <config.h>
-
-#include <unistd.h>
-#include <fcntl.h>
-
-#ifndef HAVE_ACCESS
-/* Mingw lacks access, but it also lacks real vs. effective ids, so
- the gnulib euidaccess module is good enough. */
-# undef access
-# define access euidaccess
-#endif
-
-/* Invoke access or euidaccess on file, FILE, using mode MODE, in the directory
- open on descriptor FD. If possible, do it without changing the
- working directory. Otherwise, resort to using save_cwd/fchdir, then
- (access|euidaccess)/restore_cwd. If either the save_cwd or the
- restore_cwd fails, then give a diagnostic and exit nonzero.
- Note that this implementation only supports AT_EACCESS, although some
- native versions also support AT_SYMLINK_NOFOLLOW. */
-
-#define AT_FUNC_NAME faccessat
-#define AT_FUNC_F1 euidaccess
-#define AT_FUNC_F2 access
-#define AT_FUNC_USE_F1_COND AT_EACCESS
-#define AT_FUNC_POST_FILE_PARAM_DECLS , int mode, int flag
-#define AT_FUNC_POST_FILE_ARGS , mode
-#include "at-func.c"
=== removed file 'lib/fcntl.in.h'
--- a/lib/fcntl.in.h 2012-10-19 17:14:00 +0000
+++ b/lib/fcntl.in.h 1970-01-01 00:00:00 +0000
@@ -1,347 +0,0 @@
-/* Like <fcntl.h>, but with non-working flags defined to 0.
-
- Copyright (C) 2006-2012 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 */
-
-#if __GNUC__ >= 3
address@hidden@
-#endif
address@hidden@
-
-#if defined __need_system_fcntl_h
-/* Special invocation convention. */
-
-/* Needed before <sys/stat.h>.
- May also define off_t to a 64-bit type on native Windows. */
-#include <sys/types.h>
-/* On some systems other than glibc, <sys/stat.h> is a prerequisite of
- <fcntl.h>. On glibc systems, we would like to avoid namespace pollution.
- But on glibc systems, <fcntl.h> includes <sys/stat.h> inside an
- extern "C" { ... } block, which leads to errors in C++ mode with the
- overridden <sys/stat.h> from gnulib. These errors are known to be gone
- with g++ version >= 4.3. */
-#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus &&
defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__
>= 3)))
-# include <sys/stat.h>
-#endif
address@hidden@ @NEXT_FCNTL_H@
-
-#else
-/* Normal invocation convention. */
-
-#ifndef address@hidden@_FCNTL_H
-
-/* Needed before <sys/stat.h>.
- May also define off_t to a 64-bit type on native Windows. */
-#include <sys/types.h>
-/* On some systems other than glibc, <sys/stat.h> is a prerequisite of
- <fcntl.h>. On glibc systems, we would like to avoid namespace pollution.
- But on glibc systems, <fcntl.h> includes <sys/stat.h> inside an
- extern "C" { ... } block, which leads to errors in C++ mode with the
- overridden <sys/stat.h> from gnulib. These errors are known to be gone
- with g++ version >= 4.3. */
-#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus &&
defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__
>= 3)))
-# include <sys/stat.h>
-#endif
-/* The include_next requires a split double-inclusion guard. */
address@hidden@ @NEXT_FCNTL_H@
-
-#ifndef address@hidden@_FCNTL_H
-#define address@hidden@_FCNTL_H
-
-#ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems. */
-# include <unistd.h>
-#endif
-
-/* Native Windows platforms declare open(), creat() in <io.h>. */
-#if (@GNULIB_OPEN@ || defined GNULIB_POSIXCHECK) \
- && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
-# include <io.h>
-#endif
-
-
-/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
-
-/* The definition of _GL_ARG_NONNULL is copied here. */
-
-/* The definition of _GL_WARN_ON_USE is copied here. */
-
-
-/* Declare overridden functions. */
-
-#if @GNULIB_FCNTL@
-# if @REPLACE_FCNTL@
-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-# undef fcntl
-# define fcntl rpl_fcntl
-# endif
-_GL_FUNCDECL_RPL (fcntl, int, (int fd, int action, ...));
-_GL_CXXALIAS_RPL (fcntl, int, (int fd, int action, ...));
-# else
-# if address@hidden@
-_GL_FUNCDECL_SYS (fcntl, int, (int fd, int action, ...));
-# endif
-_GL_CXXALIAS_SYS (fcntl, int, (int fd, int action, ...));
-# endif
-_GL_CXXALIASWARN (fcntl);
-#elif defined GNULIB_POSIXCHECK
-# undef fcntl
-# if HAVE_RAW_DECL_FCNTL
-_GL_WARN_ON_USE (fcntl, "fcntl is not always POSIX compliant - "
- "use gnulib module fcntl for portability");
-# endif
-#endif
-
-#if @GNULIB_OPEN@
-# if @REPLACE_OPEN@
-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-# undef open
-# define open rpl_open
-# endif
-_GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
- _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
-# else
-_GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
-# endif
-/* On HP-UX 11, in C++ mode, open() is defined as an inline function with a
- default argument. _GL_CXXALIASWARN does not work in this case. */
-# if !defined __hpux
-_GL_CXXALIASWARN (open);
-# endif
-#elif defined GNULIB_POSIXCHECK
-# undef open
-/* Assume open is always declared. */
-_GL_WARN_ON_USE (open, "open is not always POSIX compliant - "
- "use gnulib module open for portability");
-#endif
-
-#if @GNULIB_OPENAT@
-# if @REPLACE_OPENAT@
-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-# undef openat
-# define openat rpl_openat
-# endif
-_GL_FUNCDECL_RPL (openat, int,
- (int fd, char const *file, int flags, /* mode_t mode */ ...)
- _GL_ARG_NONNULL ((2)));
-_GL_CXXALIAS_RPL (openat, int,
- (int fd, char const *file, int flags, /* mode_t mode */
...));
-# else
-# if address@hidden@
-_GL_FUNCDECL_SYS (openat, int,
- (int fd, char const *file, int flags, /* mode_t mode */ ...)
- _GL_ARG_NONNULL ((2)));
-# endif
-_GL_CXXALIAS_SYS (openat, int,
- (int fd, char const *file, int flags, /* mode_t mode */
...));
-# endif
-_GL_CXXALIASWARN (openat);
-#elif defined GNULIB_POSIXCHECK
-# undef openat
-# if HAVE_RAW_DECL_OPENAT
-_GL_WARN_ON_USE (openat, "openat is not portable - "
- "use gnulib module openat for portability");
-# endif
-#endif
-
-
-/* Fix up the FD_* macros, only known to be missing on mingw. */
-
-#ifndef FD_CLOEXEC
-# define FD_CLOEXEC 1
-#endif
-
-/* Fix up the supported F_* macros. Intentionally leave other F_*
- macros undefined. Only known to be missing on mingw. */
-
-#ifndef F_DUPFD_CLOEXEC
-# define F_DUPFD_CLOEXEC 0x40000000
-/* Witness variable: 1 if gnulib defined F_DUPFD_CLOEXEC, 0 otherwise. */
-# define GNULIB_defined_F_DUPFD_CLOEXEC 1
-#else
-# define GNULIB_defined_F_DUPFD_CLOEXEC 0
-#endif
-
-#ifndef F_DUPFD
-# define F_DUPFD 1
-#endif
-
-#ifndef F_GETFD
-# define F_GETFD 2
-#endif
-
-/* Fix up the O_* macros. */
-
-#if !defined O_DIRECT && defined O_DIRECTIO
-/* Tru64 spells it 'O_DIRECTIO'. */
-# define O_DIRECT O_DIRECTIO
-#endif
-
-#if !defined O_CLOEXEC && defined O_NOINHERIT
-/* Mingw spells it 'O_NOINHERIT'. */
-# define O_CLOEXEC O_NOINHERIT
-#endif
-
-#ifndef O_CLOEXEC
-# define O_CLOEXEC 0
-#endif
-
-#ifndef O_DIRECT
-# define O_DIRECT 0
-#endif
-
-#ifndef O_DIRECTORY
-# define O_DIRECTORY 0
-#endif
-
-#ifndef O_DSYNC
-# define O_DSYNC 0
-#endif
-
-#ifndef O_EXEC
-# define O_EXEC O_RDONLY /* This is often close enough in older systems. */
-#endif
-
-#ifndef O_IGNORE_CTTY
-# define O_IGNORE_CTTY 0
-#endif
-
-#ifndef O_NDELAY
-# define O_NDELAY 0
-#endif
-
-#ifndef O_NOATIME
-# define O_NOATIME 0
-#endif
-
-#ifndef O_NONBLOCK
-# define O_NONBLOCK O_NDELAY
-#endif
-
-/* If the gnulib module 'nonblocking' is in use, guarantee a working non-zero
- value of O_NONBLOCK. Otherwise, O_NONBLOCK is defined (above) to O_NDELAY
- or to 0 as fallback. */
-#if @GNULIB_NONBLOCKING@
-# if O_NONBLOCK
-# define GNULIB_defined_O_NONBLOCK 0
-# else
-# define GNULIB_defined_O_NONBLOCK 1
-# undef O_NONBLOCK
-# define O_NONBLOCK 0x40000000
-# endif
-#endif
-
-#ifndef O_NOCTTY
-# define O_NOCTTY 0
-#endif
-
-#ifndef O_NOFOLLOW
-# define O_NOFOLLOW 0
-#endif
-
-#ifndef O_NOLINK
-# define O_NOLINK 0
-#endif
-
-#ifndef O_NOLINKS
-# define O_NOLINKS 0
-#endif
-
-#ifndef O_NOTRANS
-# define O_NOTRANS 0
-#endif
-
-#ifndef O_RSYNC
-# define O_RSYNC 0
-#endif
-
-#ifndef O_SEARCH
-# define O_SEARCH O_RDONLY /* This is often close enough in older systems. */
-#endif
-
-#ifndef O_SYNC
-# define O_SYNC 0
-#endif
-
-#ifndef O_TTY_INIT
-# define O_TTY_INIT 0
-#endif
-
-#if O_ACCMODE != (O_RDONLY | O_WRONLY | O_RDWR | O_EXEC | O_SEARCH)
-# undef O_ACCMODE
-# define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR | O_EXEC | O_SEARCH)
-#endif
-
-/* For systems that distinguish between text and binary I/O.
- O_BINARY is usually declared in fcntl.h */
-#if !defined O_BINARY && defined _O_BINARY
- /* For MSC-compatible compilers. */
-# define O_BINARY _O_BINARY
-# define O_TEXT _O_TEXT
-#endif
-
-#if defined __BEOS__ || defined __HAIKU__
- /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect. */
-# undef O_BINARY
-# undef O_TEXT
-#endif
-
-#ifndef O_BINARY
-# define O_BINARY 0
-# define O_TEXT 0
-#endif
-
-/* Fix up the AT_* macros. */
-
-/* Work around a bug in Solaris 9 and 10: AT_FDCWD is positive. Its
- value exceeds INT_MAX, so its use as an int doesn't conform to the
- C standard, and GCC and Sun C complain in some cases. If the bug
- is present, undef AT_FDCWD here, so it can be redefined below. */
-#if 0 < AT_FDCWD && AT_FDCWD == 0xffd19553
-# undef AT_FDCWD
-#endif
-
-/* Use the same bit pattern as Solaris 9, but with the proper
- signedness. The bit pattern is important, in case this actually is
- Solaris with the above workaround. */
-#ifndef AT_FDCWD
-# define AT_FDCWD (-3041965)
-#endif
-
-/* Use the same values as Solaris 9. This shouldn't matter, but
- there's no real reason to differ. */
-#ifndef AT_SYMLINK_NOFOLLOW
-# define AT_SYMLINK_NOFOLLOW 4096
-#endif
-
-#ifndef AT_REMOVEDIR
-# define AT_REMOVEDIR 1
-#endif
-
-/* Solaris 9 lacks these two, so just pick unique values. */
-#ifndef AT_SYMLINK_FOLLOW
-# define AT_SYMLINK_FOLLOW 2
-#endif
-
-#ifndef AT_EACCESS
-# define AT_EACCESS 4
-#endif
-
-
-#endif /* address@hidden@_FCNTL_H */
-#endif /* address@hidden@_FCNTL_H */
-#endif
=== removed file 'lib/getgroups.c'
--- a/lib/getgroups.c 2012-10-19 17:14:00 +0000
+++ b/lib/getgroups.c 1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-/* provide consistent interface to getgroups for systems that don't allow N==0
-
- Copyright (C) 1996, 1999, 2003, 2006-2012 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 Jim Meyering */
-
-#include <config.h>
-
-#include <unistd.h>
-
-#include <errno.h>
-#include <stdlib.h>
-#include <stdint.h>
-
-#if !HAVE_GETGROUPS
-
-/* Provide a stub that fails with ENOSYS, since there is no group
- information available on mingw. */
-int
-getgroups (int n _GL_UNUSED, GETGROUPS_T *groups _GL_UNUSED)
-{
- errno = ENOSYS;
- return -1;
-}
-
-#else /* HAVE_GETGROUPS */
-
-# undef getgroups
-# ifndef GETGROUPS_ZERO_BUG
-# define GETGROUPS_ZERO_BUG 0
-# endif
-
-/* On at least Ultrix 4.3 and NextStep 3.2, getgroups (0, NULL) always
- fails. On other systems, it returns the number of supplemental
- groups for the process. This function handles that special case
- and lets the system-provided function handle all others. However,
- it can fail with ENOMEM if memory is tight. It is unspecified
- whether the effective group id is included in the list. */
-
-int
-rpl_getgroups (int n, gid_t *group)
-{
- int n_groups;
- GETGROUPS_T *gbuf;
- int saved_errno;
-
- if (n < 0)
- {
- errno = EINVAL;
- return -1;
- }
-
- if (n != 0 || !GETGROUPS_ZERO_BUG)
- {
- int result;
- if (sizeof *group == sizeof *gbuf)
- return getgroups (n, (GETGROUPS_T *) group);
-
- if (SIZE_MAX / sizeof *gbuf <= n)
- {
- errno = ENOMEM;
- return -1;
- }
- gbuf = malloc (n * sizeof *gbuf);
- if (!gbuf)
- return -1;
- result = getgroups (n, gbuf);
- if (0 <= result)
- {
- n = result;
- while (n--)
- group[n] = gbuf[n];
- }
- saved_errno = errno;
- free (gbuf);
- errno == saved_errno;
- return result;
- }
-
- n = 20;
- while (1)
- {
- /* No need to worry about address arithmetic overflow here,
- since the ancient systems that we're running on have low
- limits on the number of secondary groups. */
- gbuf = malloc (n * sizeof *gbuf);
- if (!gbuf)
- return -1;
- n_groups = getgroups (n, gbuf);
- if (n_groups == -1 ? errno != EINVAL : n_groups < n)
- break;
- free (gbuf);
- n *= 2;
- }
-
- saved_errno = errno;
- free (gbuf);
- errno = saved_errno;
-
- return n_groups;
-}
-
-#endif /* HAVE_GETGROUPS */
=== modified file 'lib/gnulib.mk'
--- a/lib/gnulib.mk 2012-10-19 16:52:02 +0000
+++ b/lib/gnulib.mk 2012-10-19 19:25:18 +0000
@@ -21,7 +21,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib
--m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux
--avoid=at-internal --avoid=errno --avoid=fchdir --avoid=fcntl --avoid=fstat
--avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=openat-die
--avoid=openat-h --avoid=raise --avoid=save-cwd --avoid=select
--avoid=sigprocmask --avoid=sys_types --avoid=threadlib
--makefile-name=gnulib.mk --conditional-dependencies --no-libtool
--macro-prefix=gl --no-vc-files alloca-opt c-ctype c-strcase careadlinkat
crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2
environ execinfo faccessat filemode getloadavg getopt-gnu gettime gettimeofday
ignore-value intprops largefile lstat manywarnings mktime pselect
pthread_sigmask readlink socklen stat-time stdalign stdarg stdbool stdio
strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time
timespec-add timespec-sub utimens warnings
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib
--m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux
--avoid=errno --avoid=fcntl --avoid=fcntl-h --avoid=fstat --avoid=msvc-inval
--avoid=msvc-nothrow --avoid=raise --avoid=select --avoid=sigprocmask
--avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk
--conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files
alloca-opt c-ctype c-strcase careadlinkat crypto/md5 crypto/sha1 crypto/sha256
crypto/sha512 dtoastr dtotimespec dup2 environ execinfo filemode getloadavg
getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat
manywarnings mktime pselect pthread_sigmask readlink socklen stat-time stdalign
stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time
time timer-time timespec-add timespec-sub utimens warnings
MOSTLYCLEANFILES += core *.stackdump
@@ -150,17 +150,6 @@
## end gnulib module dup2
-## begin gnulib module euidaccess
-
-if gl_GNULIB_ENABLED_euidaccess
-
-endif
-EXTRA_DIST += euidaccess.c
-
-EXTRA_libgnu_a_SOURCES += euidaccess.c
-
-## end gnulib module euidaccess
-
## begin gnulib module execinfo
BUILT_SOURCES += $(EXECINFO_H)
@@ -186,50 +175,6 @@
## end gnulib module execinfo
-## begin gnulib module faccessat
-
-
-EXTRA_DIST += at-func.c faccessat.c
-
-EXTRA_libgnu_a_SOURCES += at-func.c faccessat.c
-
-## end gnulib module faccessat
-
-## begin gnulib module fcntl-h
-
-BUILT_SOURCES += fcntl.h
-
-# We need the following in order to create <fcntl.h> when the system
-# doesn't have one that works with the given compiler.
-fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H)
$(ARG_NONNULL_H) $(WARN_ON_USE_H)
- $(AM_V_GEN)rm -f address@hidden $@ && \
- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- sed -e 's|@''GUARD_PREFIX''@|GL|g' \
- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
- -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
- -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
- -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \
- -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \
- -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \
- -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \
- -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \
- -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \
- -e 's|@''REPLACE_FCNTL''@|$(REPLACE_FCNTL)|g' \
- -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \
- -e 's|@''REPLACE_OPENAT''@|$(REPLACE_OPENAT)|g' \
- -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
- -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
- -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
- < $(srcdir)/fcntl.in.h; \
- } > address@hidden && \
- mv address@hidden $@
-MOSTLYCLEANFILES += fcntl.h fcntl.h-t
-
-EXTRA_DIST += fcntl.in.h
-
-## end gnulib module fcntl-h
-
## begin gnulib module filemode
libgnu_a_SOURCES += filemode.c
@@ -238,17 +183,6 @@
## end gnulib module filemode
-## begin gnulib module getgroups
-
-if gl_GNULIB_ENABLED_getgroups
-
-endif
-EXTRA_DIST += getgroups.c
-
-EXTRA_libgnu_a_SOURCES += getgroups.c
-
-## end gnulib module getgroups
-
## begin gnulib module getloadavg
@@ -308,17 +242,6 @@
## end gnulib module gettimeofday
-## begin gnulib module group-member
-
-if gl_GNULIB_ENABLED_a9786850e999ae65a836a6041e8e5ed1
-
-endif
-EXTRA_DIST += group-member.c
-
-EXTRA_libgnu_a_SOURCES += group-member.c
-
-## end gnulib module group-member
-
## begin gnulib module ignore-value
@@ -431,15 +354,6 @@
## end gnulib module readlink
-## begin gnulib module root-uid
-
-if gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c
-
-endif
-EXTRA_DIST += root-uid.h
-
-## end gnulib module root-uid
-
## begin gnulib module signal-h
BUILT_SOURCES += signal.h
@@ -1398,15 +1312,6 @@
## end gnulib module verify
-## begin gnulib module xalloc-oversized
-
-if gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec
-
-endif
-EXTRA_DIST += xalloc-oversized.h
-
-## end gnulib module xalloc-oversized
-
mostlyclean-local: mostlyclean-generic
@for dir in '' $(MOSTLYCLEANDIRS); do \
=== removed file 'lib/group-member.c'
--- a/lib/group-member.c 2012-10-19 17:14:00 +0000
+++ b/lib/group-member.c 1970-01-01 00:00:00 +0000
@@ -1,119 +0,0 @@
-/* group-member.c -- determine whether group id is in calling user's group list
-
- Copyright (C) 1994, 1997-1998, 2003, 2005-2006, 2009-2012 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/>. */
-
-#include <config.h>
-
-/* Specification. */
-#include <unistd.h>
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <stdlib.h>
-
-#include "xalloc-oversized.h"
-
-/* Most processes have no more than this many groups, and for these
- processes we can avoid using malloc. */
-enum { GROUPBUF_SIZE = 100 };
-
-struct group_info
- {
- gid_t *group;
- gid_t groupbuf[GROUPBUF_SIZE];
- };
-
-static void
-free_group_info (struct group_info const *g)
-{
- if (g->group != g->groupbuf)
- free (g->group);
-}
-
-static int
-get_group_info (struct group_info *gi)
-{
- int n_groups = getgroups (GROUPBUF_SIZE, gi->groupbuf);
- gi->group = gi->groupbuf;
-
- if (n_groups < 0)
- {
- int n_group_slots = getgroups (0, NULL);
- if (0 <= n_group_slots
- && ! xalloc_oversized (n_group_slots, sizeof *gi->group))
- {
- gi->group = malloc (n_group_slots * sizeof *gi->group);
- if (gi->group)
- n_groups = getgroups (n_group_slots, gi->group);
- }
- }
-
- /* In case of error, the user loses. */
- return n_groups;
-}
-
-/* Return non-zero if GID is one that we have in our groups list.
- Note that the groups list is not guaranteed to contain the current
- or effective group ID, so they should generally be checked
- separately. */
-
-int
-group_member (gid_t gid)
-{
- int i;
- int found;
- struct group_info gi;
- int n_groups = get_group_info (&gi);
-
- /* Search through the list looking for GID. */
- found = 0;
- for (i = 0; i < n_groups; i++)
- {
- if (gid == gi.group[i])
- {
- found = 1;
- break;
- }
- }
-
- free_group_info (&gi);
-
- return found;
-}
-
-#ifdef TEST
-
-char *program_name;
-
-int
-main (int argc, char **argv)
-{
- int i;
-
- program_name = argv[0];
-
- for (i = 1; i < argc; i++)
- {
- gid_t gid;
-
- gid = atoi (argv[i]);
- printf ("%d: %s\n", gid, group_member (gid) ? "yes" : "no");
- }
- exit (0);
-}
-
-#endif /* TEST */
=== removed file 'lib/root-uid.h'
--- a/lib/root-uid.h 2012-10-19 17:14:00 +0000
+++ b/lib/root-uid.h 1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-/* The user ID that always has appropriate privileges in the POSIX sense.
-
- Copyright 2012 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. */
-
-#ifndef ROOT_UID_H_
-#define ROOT_UID_H_
-
-/* The user ID that always has appropriate privileges in the POSIX sense. */
-#ifdef __TANDEM
-# define ROOT_UID 65535
-#else
-# define ROOT_UID 0
-#endif
-
-#endif
=== removed file 'lib/xalloc-oversized.h'
--- a/lib/xalloc-oversized.h 2012-10-19 17:14:00 +0000
+++ b/lib/xalloc-oversized.h 1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/* xalloc-oversized.h -- memory allocation size checking
-
- Copyright (C) 1990-2000, 2003-2004, 2006-2012 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/>. */
-
-#ifndef XALLOC_OVERSIZED_H_
-# define XALLOC_OVERSIZED_H_
-
-# include <stddef.h>
-
-/* Return 1 if an array of N objects, each of size S, cannot exist due
- to size arithmetic overflow. S must be positive and N must be
- nonnegative. This is a macro, not a function, so that it
- works correctly even when SIZE_MAX < N.
-
- By gnulib convention, SIZE_MAX represents overflow in size
- calculations, so the conservative dividend to use here is
- SIZE_MAX - 1, since SIZE_MAX might represent an overflowed value.
- However, malloc (SIZE_MAX) fails on all known hosts where
- sizeof (ptrdiff_t) <= sizeof (size_t), so do not bother to test for
- exactly-SIZE_MAX allocations on such hosts; this avoids a test and
- branch when S is known to be 1. */
-# define xalloc_oversized(n, s) \
- ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n))
-
-#endif /* !XALLOC_OVERSIZED_H_ */
=== removed file 'm4/euidaccess.m4'
--- a/m4/euidaccess.m4 2012-10-19 17:14:00 +0000
+++ b/m4/euidaccess.m4 1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-# euidaccess.m4 serial 15
-dnl Copyright (C) 2002-2012 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_NONREENTRANT_EUIDACCESS],
-[
- AC_REQUIRE([gl_FUNC_EUIDACCESS])
- AC_CHECK_DECLS([setregid])
- AC_DEFINE([PREFER_NONREENTRANT_EUIDACCESS], [1],
- [Define this if you prefer euidaccess to return the correct result
- even if this would make it nonreentrant. Define this only if your
- entire application is safe even if the uid or gid might temporarily
- change. If your application uses signal handlers or threads it
- is probably not safe.])
-])
-
-AC_DEFUN([gl_FUNC_EUIDACCESS],
-[
- AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-
- dnl Persuade glibc <unistd.h> to declare euidaccess().
- AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-
- AC_CHECK_FUNCS([euidaccess])
- if test $ac_cv_func_euidaccess = no; then
- HAVE_EUIDACCESS=0
- fi
-])
-
-# Prerequisites of lib/euidaccess.c.
-AC_DEFUN([gl_PREREQ_EUIDACCESS], [
- dnl Prefer POSIX faccessat over non-standard euidaccess.
- AC_CHECK_FUNCS_ONCE([faccessat])
- dnl Try various other non-standard fallbacks.
- AC_CHECK_HEADERS([libgen.h])
- AC_FUNC_GETGROUPS
-
- # Solaris 9 and 10 need -lgen to get the eaccess function.
- # Save and restore LIBS so -lgen isn't added to it. Otherwise, *all*
- # programs in the package would end up linked with that potentially-shared
- # library, inducing unnecessary run-time overhead.
- LIB_EACCESS=
- AC_SUBST([LIB_EACCESS])
- gl_saved_libs=$LIBS
- AC_SEARCH_LIBS([eaccess], [gen],
- [test "$ac_cv_search_eaccess" = "none required" ||
- LIB_EACCESS=$ac_cv_search_eaccess])
- AC_CHECK_FUNCS([eaccess])
- LIBS=$gl_saved_libs
-])
=== removed file 'm4/faccessat.m4'
--- a/m4/faccessat.m4 2012-10-19 17:14:00 +0000
+++ b/m4/faccessat.m4 1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-# serial 6
-# See if we need to provide faccessat replacement.
-
-dnl Copyright (C) 2009-2012 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-# Written by Eric Blake.
-
-AC_DEFUN([gl_FUNC_FACCESSAT],
-[
- AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-
- dnl Persuade glibc <unistd.h> to declare faccessat().
- AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-
- AC_CHECK_FUNCS_ONCE([faccessat])
- if test $ac_cv_func_faccessat = no; then
- HAVE_FACCESSAT=0
- fi
-])
-
-# Prerequisites of lib/faccessat.m4.
-AC_DEFUN([gl_PREREQ_FACCESSAT],
-[
- AC_CHECK_FUNCS([access])
-])
=== removed file 'm4/fcntl_h.m4'
--- a/m4/fcntl_h.m4 2012-10-19 17:14:00 +0000
+++ b/m4/fcntl_h.m4 1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-# serial 15
-# Configure fcntl.h.
-dnl Copyright (C) 2006-2007, 2009-2012 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl Written by Paul Eggert.
-
-AC_DEFUN([gl_FCNTL_H],
-[
- AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
- AC_REQUIRE([gl_FCNTL_O_FLAGS])
- gl_NEXT_HEADERS([fcntl.h])
-
- dnl Ensure the type pid_t gets defined.
- AC_REQUIRE([AC_TYPE_PID_T])
-
- dnl Ensure the type mode_t gets defined.
- AC_REQUIRE([AC_TYPE_MODE_T])
-
- dnl Check for declarations of anything we want to poison if the
- dnl corresponding gnulib module is not in use, if it is not common
- dnl enough to be declared everywhere.
- gl_WARN_ON_USE_PREPARE([[#include <fcntl.h>
- ]], [fcntl openat])
-])
-
-AC_DEFUN([gl_FCNTL_MODULE_INDICATOR],
-[
- dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
- AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
- gl_MODULE_INDICATOR_SET_VARIABLE([$1])
- dnl Define it also as a C macro, for the benefit of the unit tests.
- gl_MODULE_INDICATOR_FOR_TESTS([$1])
-])
-
-AC_DEFUN([gl_FCNTL_H_DEFAULTS],
-[
- GNULIB_FCNTL=0; AC_SUBST([GNULIB_FCNTL])
- GNULIB_NONBLOCKING=0; AC_SUBST([GNULIB_NONBLOCKING])
- GNULIB_OPEN=0; AC_SUBST([GNULIB_OPEN])
- GNULIB_OPENAT=0; AC_SUBST([GNULIB_OPENAT])
- dnl Assume proper GNU behavior unless another module says otherwise.
- HAVE_FCNTL=1; AC_SUBST([HAVE_FCNTL])
- HAVE_OPENAT=1; AC_SUBST([HAVE_OPENAT])
- REPLACE_FCNTL=0; AC_SUBST([REPLACE_FCNTL])
- REPLACE_OPEN=0; AC_SUBST([REPLACE_OPEN])
- REPLACE_OPENAT=0; AC_SUBST([REPLACE_OPENAT])
-])
=== removed file 'm4/getgroups.m4'
--- a/m4/getgroups.m4 2012-10-19 17:14:00 +0000
+++ b/m4/getgroups.m4 1970-01-01 00:00:00 +0000
@@ -1,107 +0,0 @@
-# serial 18
-
-dnl From Jim Meyering.
-dnl A wrapper around AC_FUNC_GETGROUPS.
-
-# Copyright (C) 1996-1997, 1999-2004, 2008-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-m4_version_prereq([2.70], [] ,[
-
-# This is taken from the following Autoconf patch:
-#
http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9
-AC_DEFUN([AC_FUNC_GETGROUPS],
-[
- AC_REQUIRE([AC_TYPE_GETGROUPS])dnl
- AC_REQUIRE([AC_TYPE_SIZE_T])dnl
- AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
- AC_CHECK_FUNC([getgroups])
-
- # If we don't yet have getgroups, see if it's in -lbsd.
- # This is reported to be necessary on an ITOS 3000WS running SEIUX 3.1.
- ac_save_LIBS=$LIBS
- if test $ac_cv_func_getgroups = no; then
- AC_CHECK_LIB(bsd, getgroups, [GETGROUPS_LIB=-lbsd])
- fi
-
- # Run the program to test the functionality of the system-supplied
- # getgroups function only if there is such a function.
- if test $ac_cv_func_getgroups = yes; then
- AC_CACHE_CHECK([for working getgroups], [ac_cv_func_getgroups_works],
- [AC_RUN_IFELSE(
- [AC_LANG_PROGRAM(
- [AC_INCLUDES_DEFAULT],
- [[/* On Ultrix 4.3, getgroups (0, 0) always fails. */
- return getgroups (0, 0) == -1;]])
- ],
- [ac_cv_func_getgroups_works=yes],
- [ac_cv_func_getgroups_works=no],
- [case "$host_os" in # ((
- # Guess yes on glibc systems.
- *-gnu*) ac_cv_func_getgroups_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) ac_cv_func_getgroups_works="guessing no" ;;
- esac
- ])
- ])
- else
- ac_cv_func_getgroups_works=no
- fi
- case "$ac_cv_func_getgroups_works" in
- *yes)
- AC_DEFINE([HAVE_GETGROUPS], [1],
- [Define to 1 if your system has a working `getgroups' function.])
- ;;
- esac
- LIBS=$ac_save_LIBS
-])# AC_FUNC_GETGROUPS
-
-])
-
-AC_DEFUN([gl_FUNC_GETGROUPS],
-[
- AC_REQUIRE([AC_TYPE_GETGROUPS])
- AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
- AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
- AC_FUNC_GETGROUPS
- if test $ac_cv_func_getgroups != yes; then
- HAVE_GETGROUPS=0
- else
- if test "$ac_cv_type_getgroups" != gid_t \
- || { case "$ac_cv_func_getgroups_works" in
- *yes) false;;
- *) true;;
- esac
- }; then
- REPLACE_GETGROUPS=1
- AC_DEFINE([GETGROUPS_ZERO_BUG], [1], [Define this to 1 if
- getgroups(0,NULL) does not return the number of groups.])
- else
- dnl Detect FreeBSD bug; POSIX requires getgroups(-1,ptr) to fail.
- AC_CACHE_CHECK([whether getgroups handles negative values],
- [gl_cv_func_getgroups_works],
- [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
- [[int size = getgroups (0, 0);
- gid_t *list = malloc (size * sizeof *list);
- return getgroups (-1, list) != -1;]])],
- [gl_cv_func_getgroups_works=yes],
- [gl_cv_func_getgroups_works=no],
- [case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_getgroups_works="guessing yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_getgroups_works="guessing no" ;;
- esac
- ])])
- case "$gl_cv_func_getgroups_works" in
- *yes) ;;
- *) REPLACE_GETGROUPS=1 ;;
- esac
- fi
- fi
- test -n "$GETGROUPS_LIB" && LIBS="$GETGROUPS_LIB $LIBS"
-])
=== modified file 'm4/gnulib-comp.m4'
--- a/m4/gnulib-comp.m4 2012-10-19 16:52:02 +0000
+++ b/m4/gnulib-comp.m4 2012-10-19 19:25:18 +0000
@@ -53,22 +53,17 @@
# Code from module dtotimespec:
# Code from module dup2:
# Code from module environ:
- # Code from module euidaccess:
# Code from module execinfo:
# Code from module extensions:
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
# Code from module extern-inline:
- # Code from module faccessat:
- # Code from module fcntl-h:
# Code from module filemode:
- # Code from module getgroups:
# Code from module getloadavg:
# Code from module getopt-gnu:
# Code from module getopt-posix:
# Code from module gettext-h:
# Code from module gettime:
# Code from module gettimeofday:
- # Code from module group-member:
# Code from module ignore-value:
# Code from module include_next:
# Code from module intprops:
@@ -84,7 +79,6 @@
# Code from module pselect:
# Code from module pthread_sigmask:
# Code from module readlink:
- # Code from module root-uid:
# Code from module signal-h:
# Code from module snippet/_Noreturn:
# Code from module snippet/arg-nonnull:
@@ -126,7 +120,6 @@
# Code from module utimens:
# Code from module verify:
# Code from module warnings:
- # Code from module xalloc-oversized:
])
# This macro should be invoked from ./configure.ac, in the section
@@ -163,14 +156,6 @@
gl_UNISTD_MODULE_INDICATOR([environ])
gl_EXECINFO_H
AC_REQUIRE([gl_EXTERN_INLINE])
- gl_FUNC_FACCESSAT
- if test $HAVE_FACCESSAT = 0; then
- AC_LIBOBJ([faccessat])
- gl_PREREQ_FACCESSAT
- fi
- gl_MODULE_INDICATOR([faccessat])
- gl_UNISTD_MODULE_INDICATOR([faccessat])
- gl_FCNTL_H
gl_FILEMODE
gl_GETLOADAVG
if test $HAVE_GETLOADAVG = 0; then
@@ -284,53 +269,18 @@
gl_UNISTD_H
gl_UTIMENS
gl_gnulib_enabled_dosname=false
- gl_gnulib_enabled_euidaccess=false
- gl_gnulib_enabled_getgroups=false
gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false
- gl_gnulib_enabled_a9786850e999ae65a836a6041e8e5ed1=false
gl_gnulib_enabled_pathmax=false
- gl_gnulib_enabled_6099e9737f757db36c47fa9d9f02e88c=false
gl_gnulib_enabled_stat=false
gl_gnulib_enabled_strtoll=false
gl_gnulib_enabled_strtoull=false
gl_gnulib_enabled_verify=false
- gl_gnulib_enabled_682e609604ccaac6be382e4ee3a4eaec=false
func_gl_gnulib_m4code_dosname ()
{
if ! $gl_gnulib_enabled_dosname; then
gl_gnulib_enabled_dosname=true
fi
}
- func_gl_gnulib_m4code_euidaccess ()
- {
- if ! $gl_gnulib_enabled_euidaccess; then
- gl_FUNC_EUIDACCESS
- if test $HAVE_EUIDACCESS = 0; then
- AC_LIBOBJ([euidaccess])
- gl_PREREQ_EUIDACCESS
- fi
- gl_UNISTD_MODULE_INDICATOR([euidaccess])
- gl_gnulib_enabled_euidaccess=true
- if test $HAVE_EUIDACCESS = 0; then
- func_gl_gnulib_m4code_a9786850e999ae65a836a6041e8e5ed1
- fi
- func_gl_gnulib_m4code_6099e9737f757db36c47fa9d9f02e88c
- if test $HAVE_EUIDACCESS = 0; then
- func_gl_gnulib_m4code_stat
- fi
- fi
- }
- func_gl_gnulib_m4code_getgroups ()
- {
- if ! $gl_gnulib_enabled_getgroups; then
- gl_FUNC_GETGROUPS
- if test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1; then
- AC_LIBOBJ([getgroups])
- fi
- gl_UNISTD_MODULE_INDICATOR([getgroups])
- gl_gnulib_enabled_getgroups=true
- fi
- }
func_gl_gnulib_m4code_be453cec5eecf5731a274f2de7f2db36 ()
{
if ! $gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36; then
@@ -339,24 +289,6 @@
gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=true
fi
}
- func_gl_gnulib_m4code_a9786850e999ae65a836a6041e8e5ed1 ()
- {
- if ! $gl_gnulib_enabled_a9786850e999ae65a836a6041e8e5ed1; then
- gl_FUNC_GROUP_MEMBER
- if test $HAVE_GROUP_MEMBER = 0; then
- AC_LIBOBJ([group-member])
- gl_PREREQ_GROUP_MEMBER
- fi
- gl_UNISTD_MODULE_INDICATOR([group-member])
- gl_gnulib_enabled_a9786850e999ae65a836a6041e8e5ed1=true
- if test $HAVE_GROUP_MEMBER = 0; then
- func_gl_gnulib_m4code_getgroups
- fi
- if test $HAVE_GROUP_MEMBER = 0; then
- func_gl_gnulib_m4code_682e609604ccaac6be382e4ee3a4eaec
- fi
- fi
- }
func_gl_gnulib_m4code_pathmax ()
{
if ! $gl_gnulib_enabled_pathmax; then
@@ -364,12 +296,6 @@
gl_gnulib_enabled_pathmax=true
fi
}
- func_gl_gnulib_m4code_6099e9737f757db36c47fa9d9f02e88c ()
- {
- if ! $gl_gnulib_enabled_6099e9737f757db36c47fa9d9f02e88c; then
- gl_gnulib_enabled_6099e9737f757db36c47fa9d9f02e88c=true
- fi
- }
func_gl_gnulib_m4code_stat ()
{
if ! $gl_gnulib_enabled_stat; then
@@ -421,18 +347,6 @@
gl_gnulib_enabled_verify=true
fi
}
- func_gl_gnulib_m4code_682e609604ccaac6be382e4ee3a4eaec ()
- {
- if ! $gl_gnulib_enabled_682e609604ccaac6be382e4ee3a4eaec; then
- gl_gnulib_enabled_682e609604ccaac6be382e4ee3a4eaec=true
- fi
- }
- if test $HAVE_FACCESSAT = 0; then
- func_gl_gnulib_m4code_dosname
- fi
- if test $HAVE_FACCESSAT = 0; then
- func_gl_gnulib_m4code_euidaccess
- fi
if test $REPLACE_GETOPT = 1; then
func_gl_gnulib_m4code_be453cec5eecf5731a274f2de7f2db36
fi
@@ -459,17 +373,12 @@
fi
m4_pattern_allow([^gl_GNULIB_ENABLED_])
AM_CONDITIONAL([gl_GNULIB_ENABLED_dosname], [$gl_gnulib_enabled_dosname])
- AM_CONDITIONAL([gl_GNULIB_ENABLED_euidaccess],
[$gl_gnulib_enabled_euidaccess])
- AM_CONDITIONAL([gl_GNULIB_ENABLED_getgroups], [$gl_gnulib_enabled_getgroups])
AM_CONDITIONAL([gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36],
[$gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36])
- AM_CONDITIONAL([gl_GNULIB_ENABLED_a9786850e999ae65a836a6041e8e5ed1],
[$gl_gnulib_enabled_a9786850e999ae65a836a6041e8e5ed1])
AM_CONDITIONAL([gl_GNULIB_ENABLED_pathmax], [$gl_gnulib_enabled_pathmax])
- AM_CONDITIONAL([gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c],
[$gl_gnulib_enabled_6099e9737f757db36c47fa9d9f02e88c])
AM_CONDITIONAL([gl_GNULIB_ENABLED_stat], [$gl_gnulib_enabled_stat])
AM_CONDITIONAL([gl_GNULIB_ENABLED_strtoll], [$gl_gnulib_enabled_strtoll])
AM_CONDITIONAL([gl_GNULIB_ENABLED_strtoull], [$gl_gnulib_enabled_strtoull])
AM_CONDITIONAL([gl_GNULIB_ENABLED_verify], [$gl_gnulib_enabled_verify])
- AM_CONDITIONAL([gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec],
[$gl_gnulib_enabled_682e609604ccaac6be382e4ee3a4eaec])
# End of code from modules
m4_ifval(gl_LIBSOURCES_LIST, [
m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
@@ -618,7 +527,6 @@
lib/alloca.in.h
lib/allocator.c
lib/allocator.h
- lib/at-func.c
lib/c-ctype.c
lib/c-ctype.h
lib/c-strcase.h
@@ -630,16 +538,12 @@
lib/dtoastr.c
lib/dtotimespec.c
lib/dup2.c
- lib/euidaccess.c
lib/execinfo.c
lib/execinfo.in.h
- lib/faccessat.c
- lib/fcntl.in.h
lib/filemode.c
lib/filemode.h
lib/ftoastr.c
lib/ftoastr.h
- lib/getgroups.c
lib/getloadavg.c
lib/getopt.c
lib/getopt.in.h
@@ -648,7 +552,6 @@
lib/gettext.h
lib/gettime.c
lib/gettimeofday.c
- lib/group-member.c
lib/ignore-value.h
lib/intprops.h
lib/inttypes.in.h
@@ -661,7 +564,6 @@
lib/pselect.c
lib/pthread_sigmask.c
lib/readlink.c
- lib/root-uid.h
lib/sha1.c
lib/sha1.h
lib/sha256.c
@@ -703,28 +605,21 @@
lib/utimens.c
lib/utimens.h
lib/verify.h
- lib/xalloc-oversized.h
m4/00gnulib.m4
m4/alloca.m4
m4/c-strtod.m4
m4/clock_time.m4
m4/dup2.m4
m4/environ.m4
- m4/euidaccess.m4
m4/execinfo.m4
m4/extensions.m4
m4/extern-inline.m4
- m4/faccessat.m4
- m4/fcntl-o.m4
- m4/fcntl_h.m4
m4/filemode.m4
- m4/getgroups.m4
m4/getloadavg.m4
m4/getopt.m4
m4/gettime.m4
m4/gettimeofday.m4
m4/gnulib-common.m4
- m4/group-member.m4
m4/include_next.m4
m4/inttypes.m4
m4/largefile.m4
=== removed file 'm4/group-member.m4'
--- a/m4/group-member.m4 2012-10-19 17:14:00 +0000
+++ b/m4/group-member.m4 1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-# serial 14
-
-# Copyright (C) 1999-2001, 2003-2007, 2009-2012 Free Software Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-dnl Written by Jim Meyering
-
-AC_DEFUN([gl_FUNC_GROUP_MEMBER],
-[
- AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-
- dnl Persuade glibc <unistd.h> to declare group_member().
- AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-
- dnl Do this replacement check manually because I want the hyphen
- dnl (not the underscore) in the filename.
- AC_CHECK_FUNC([group_member], , [
- HAVE_GROUP_MEMBER=0
- ])
-])
-
-# Prerequisites of lib/group-member.c.
-AC_DEFUN([gl_PREREQ_GROUP_MEMBER],
-[
- AC_REQUIRE([AC_FUNC_GETGROUPS])
-])
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2012-10-19 16:52:02 +0000
+++ b/nt/ChangeLog 2012-10-19 19:25:18 +0000
@@ -1,10 +1,3 @@
-2012-10-19 Paul Eggert <address@hidden>
-
- Use faccessat, not access, when checking file permissions (Bug#12632).
- * inc/ms-w32.h (AT_FDCWD, AT_EACCESS): New symbols.
- (access): Remove.
- (faccessat): New macro.
-
2012-10-17 Eli Zaretskii <address@hidden>
* inc/pwd.h (getuid, geteuid): Add prototypes.
=== modified file 'nt/inc/ms-w32.h'
--- a/nt/inc/ms-w32.h 2012-10-19 16:52:02 +0000
+++ b/nt/inc/ms-w32.h 2012-10-19 19:25:18 +0000
@@ -124,10 +124,6 @@
#define MAXPATHLEN _MAX_PATH
#endif
-/* Use values compatible with gnulib, as there's no reason to differ. */
-#define AT_FDCWD (-3041965)
-#define AT_EACCESS 4
-
#ifdef HAVE_NTGUI
#define HAVE_WINDOW_SYSTEM 1
#define HAVE_MENUS 1
@@ -149,6 +145,8 @@
#endif
/* Calls that are emulated or shadowed. */
+#undef access
+#define access sys_access
#undef chdir
#define chdir sys_chdir
#undef chmod
@@ -163,7 +161,6 @@
#define dup sys_dup
#undef dup2
#define dup2 sys_dup2
-#define faccessat sys_faccessat
#define fopen sys_fopen
#define link sys_link
#define localtime sys_localtime
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-10-19 16:52:02 +0000
+++ b/src/ChangeLog 2012-10-19 19:25:18 +0000
@@ -1,32 +1,3 @@
-2012-10-19 Paul Eggert <address@hidden>
-
- Use faccessat, not access, when checking file permissions (Bug#12632).
- * Makefile.in (LIB_EACCESS): New macro.
- (LIBES): Use it.
- * callproc.c (init_callproc):
- * charset.c (init_charset):
- * fileio.c (check_existing, check_executable):
- * lread.c (openp, load_path_check):
- * process.c (allocate_pty):
- * xrdb.c (file_p):
- Use faccessat, not access or euidaccess. Use symbolic names
- instead of integers for the flags, as they're portable now.
- * charset.c, xrdb.c: Include <fcntl.h>, for the new flags used.
- * fileio.c (Ffile_readable_p):
- Use faccessat, not stat + open + close.
- (file_directory_p): New function, which uses 'stat' on most places
- but 'access' (for efficiency) if WINDOWSNT.
- * fileio.c (Ffile_directory_p, Fset_file_times):
- * xrdb.c (file_p): Use file_directory_p.
- * lisp.h (file_directory_p): New decl.
- * lread.c (openp): When opening a file, use fstat rather than
- stat, as that avoids a permissions race. When not opening a file,
- use file_directory_p rather than stat.
- * process.c, sysdep.c, term.c: All uses of '#ifdef O_NONBLOCK'
- changed to '#if O_NONBLOCK', to accommodate gnulib O_* style.
- * w32.c (sys_faccessat): Rename from sys_access and switch to
- faccessat's API. All uses changed.
-
2012-10-19 Kazuhiro Ito <address@hidden> (tiny change)
* font.c (Ffont_at): Fix previous change.
=== modified file 'src/Makefile.in'
--- a/src/Makefile.in 2012-10-19 16:52:02 +0000
+++ b/src/Makefile.in 2012-10-19 19:25:18 +0000
@@ -150,7 +150,6 @@
M17N_FLT_LIBS = @M17N_FLT_LIBS@
address@hidden@
address@hidden@
address@hidden@
DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -393,7 +392,7 @@
LIBES = $(LIBS) $(W32_LIBS) $(LIBX_BASE) $(LIBIMAGE) \
$(LIBX_OTHER) $(LIBSOUND) \
$(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) \
- $(LIB_EACCESS) $(LIB_TIMER_TIME) $(DBUS_LIBS) \
+ $(LIB_TIMER_TIME) $(DBUS_LIBS) \
$(LIB_EXECINFO) \
$(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
$(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
=== modified file 'src/callproc.c'
--- a/src/callproc.c 2012-10-19 16:52:02 +0000
+++ b/src/callproc.c 2012-10-19 19:25:18 +0000
@@ -1597,13 +1597,13 @@
#endif
{
tempdir = Fdirectory_file_name (Vexec_directory);
- if (faccessat (AT_FDCWD, SSDATA (tempdir), F_OK, AT_EACCESS) != 0)
+ if (access (SSDATA (tempdir), 0) < 0)
dir_warning ("Warning: arch-dependent data dir (%s) does not exist.\n",
Vexec_directory);
}
tempdir = Fdirectory_file_name (Vdata_directory);
- if (faccessat (AT_FDCWD, SSDATA (tempdir), F_OK, AT_EACCESS) != 0)
+ if (access (SSDATA (tempdir), 0) < 0)
dir_warning ("Warning: arch-independent data dir (%s) does not exist.\n",
Vdata_directory);
=== modified file 'src/charset.c'
--- a/src/charset.c 2012-10-19 16:52:02 +0000
+++ b/src/charset.c 2012-10-19 19:25:18 +0000
@@ -28,7 +28,6 @@
#define CHARSET_INLINE EXTERN_INLINE
-#include <fcntl.h>
#include <stdio.h>
#include <unistd.h>
#include <limits.h>
@@ -2294,7 +2293,7 @@
{
Lisp_Object tempdir;
tempdir = Fexpand_file_name (build_string ("charsets"), Vdata_directory);
- if (faccessat (AT_FDCWD, SSDATA (tempdir), F_OK, AT_EACCESS) != 0)
+ if (access (SSDATA (tempdir), 0) < 0)
{
/* This used to be non-fatal (dir_warning), but it should not
happen, and if it does sooner or later it will cause some
=== modified file 'src/conf_post.h'
--- a/src/conf_post.h 2012-10-19 16:52:02 +0000
+++ b/src/conf_post.h 2012-10-19 19:25:18 +0000
@@ -169,10 +169,6 @@
#endif
#endif
-/* Tell gnulib to omit support for openat-related functions having a
- first argument other than AT_FDCWD. */
-#define GNULIB_SUPPORT_ONLY_AT_FDCWD
-
#include <string.h>
#include <stdlib.h>
=== modified file 'src/fileio.c'
--- a/src/fileio.c 2012-10-19 16:52:02 +0000
+++ b/src/fileio.c 2012-10-19 19:25:18 +0000
@@ -2425,7 +2425,15 @@
bool
check_existing (const char *filename)
{
- return faccessat (AT_FDCWD, filename, F_OK, AT_EACCESS) == 0;
+#ifdef DOS_NT
+ /* The full emulation of Posix 'stat' is too expensive on
+ DOS/Windows, when all we want to know is whether the file exists.
+ So we use 'access' instead, which is much more lightweight. */
+ return (access (filename, F_OK) >= 0);
+#else
+ struct stat st;
+ return (stat (filename, &st) >= 0);
+#endif
}
/* Return true if file FILENAME exists and can be executed. */
@@ -2433,7 +2441,21 @@
static bool
check_executable (char *filename)
{
- return faccessat (AT_FDCWD, filename, X_OK, AT_EACCESS) == 0;
+#ifdef DOS_NT
+ struct stat st;
+ if (stat (filename, &st) < 0)
+ return 0;
+ return ((st.st_mode & S_IEXEC) != 0);
+#else /* not DOS_NT */
+#ifdef HAVE_EUIDACCESS
+ return (euidaccess (filename, 1) >= 0);
+#else
+ /* Access isn't quite right because it uses the real uid
+ and we really want to test with the effective uid.
+ But Unix doesn't give us a right way to do it. */
+ return (access (filename, 1) >= 0);
+#endif
+#endif /* not DOS_NT */
}
/* Return true if file FILENAME exists and can be written. */
@@ -2442,16 +2464,15 @@
check_writable (const char *filename)
{
#ifdef MSDOS
- /* FIXME: an faccessat implementation should be added to the
- DOS/Windows ports and this #ifdef branch should be removed. */
struct stat st;
if (stat (filename, &st) < 0)
return 0;
return (st.st_mode & S_IWRITE || S_ISDIR (st.st_mode));
#else /* not MSDOS */
- bool res = faccessat (AT_FDCWD, filename, W_OK, AT_EACCESS) == 0;
+#ifdef HAVE_EUIDACCESS
+ bool res = (euidaccess (filename, 2) >= 0);
#ifdef CYGWIN
- /* faccessat may have returned failure because Cygwin couldn't
+ /* euidaccess may have returned failure because Cygwin couldn't
determine the file's UID or GID; if so, we return success. */
if (!res)
{
@@ -2462,6 +2483,14 @@
}
#endif /* CYGWIN */
return res;
+#else /* not HAVE_EUIDACCESS */
+ /* Access isn't quite right because it uses the real uid
+ and we really want to test with the effective uid.
+ But Unix doesn't give us a right way to do it.
+ Opening with O_WRONLY could work for an ordinary file,
+ but would lose for directories. */
+ return (access (filename, 2) >= 0);
+#endif /* not HAVE_EUIDACCESS */
#endif /* not MSDOS */
}
@@ -2518,6 +2547,9 @@
{
Lisp_Object absname;
Lisp_Object handler;
+ int desc;
+ int flags;
+ struct stat statbuf;
CHECK_STRING (filename);
absname = Fexpand_file_name (filename, Qnil);
@@ -2529,8 +2561,31 @@
return call2 (handler, Qfile_readable_p, absname);
absname = ENCODE_FILE (absname);
- return (faccessat (AT_FDCWD, SSDATA (absname), R_OK, AT_EACCESS) == 0
- ? Qt : Qnil);
+
+#if defined (DOS_NT) || defined (macintosh)
+ /* Under MS-DOS, Windows, and Macintosh, open does not work for
+ directories. */
+ if (access (SDATA (absname), 0) == 0)
+ return Qt;
+ return Qnil;
+#else /* not DOS_NT and not macintosh */
+ flags = O_RDONLY;
+#ifdef O_NONBLOCK
+ /* Opening a fifo without O_NONBLOCK can wait.
+ We don't want to wait. But we don't want to mess wth O_NONBLOCK
+ except in the case of a fifo, on a system which handles it. */
+ desc = stat (SSDATA (absname), &statbuf);
+ if (desc < 0)
+ return Qnil;
+ if (S_ISFIFO (statbuf.st_mode))
+ flags |= O_NONBLOCK;
+#endif
+ desc = emacs_open (SSDATA (absname), flags, 0);
+ if (desc < 0)
+ return Qnil;
+ emacs_close (desc);
+ return Qt;
+#endif /* not DOS_NT and not macintosh */
}
/* Having this before file-symlink-p mysteriously caused it to be forgotten
@@ -2567,7 +2622,7 @@
/* The read-only attribute of the parent directory doesn't affect
whether a file or directory can be created within it. Some day we
should check ACLs though, which do affect this. */
- return file_directory_p (SDATA (dir)) ? Qt : Qnil;
+ return (access (SDATA (dir), D_OK) < 0) ? Qnil : Qt;
#else
return (check_writable (!NILP (dir) ? SSDATA (dir) : "")
? Qt : Qnil);
@@ -2648,7 +2703,8 @@
See `file-symlink-p' to distinguish symlinks. */)
(Lisp_Object filename)
{
- Lisp_Object absname;
+ register Lisp_Object absname;
+ struct stat st;
Lisp_Object handler;
absname = expand_and_dir_to_file (filename, BVAR (current_buffer,
directory));
@@ -2661,20 +2717,9 @@
absname = ENCODE_FILE (absname);
- return file_directory_p (SSDATA (absname)) ? Qt : Qnil;
-}
-
-/* Return true if FILE is a directory or a symlink to a directory. */
-bool
-file_directory_p (char const *file)
-{
-#ifdef WINDOWSNT
- /* This is cheaper than 'stat'. */
- return faccessat (AT_FDCWD, file, D_OK, AT_EACCESS) == 0;
-#else
- struct stat st;
- return stat (file, &st) == 0 && S_ISDIR (st.st_mode);
-#endif
+ if (stat (SSDATA (absname), &st) < 0)
+ return Qnil;
+ return S_ISDIR (st.st_mode) ? Qt : Qnil;
}
DEFUN ("file-accessible-directory-p", Ffile_accessible_directory_p,
@@ -2999,8 +3044,10 @@
if (set_file_times (-1, SSDATA (encoded_absname), t, t))
{
#ifdef MSDOS
+ struct stat st;
+
/* Setting times on a directory always fails. */
- if (file_directory_p (SSDATA (encoded_absname)))
+ if (stat (SSDATA (encoded_absname), &st) == 0 && S_ISDIR (st.st_mode))
return Qnil;
#endif
report_file_error ("Setting file times", Fcons (absname, Qnil));
=== modified file 'src/lisp.h'
--- a/src/lisp.h 2012-10-19 16:52:02 +0000
+++ b/src/lisp.h 2012-10-19 19:25:18 +0000
@@ -3178,7 +3178,6 @@
extern Lisp_Object restore_point_unwind (Lisp_Object);
extern _Noreturn void report_file_error (const char *, Lisp_Object);
extern void internal_delete_file (Lisp_Object);
-extern bool file_directory_p (const char *);
extern void syms_of_fileio (void);
extern Lisp_Object make_temp_name (Lisp_Object, bool);
extern Lisp_Object Qdelete_file;
=== modified file 'src/lread.c'
--- a/src/lread.c 2012-10-19 16:52:02 +0000
+++ b/src/lread.c 2012-10-19 19:25:18 +0000
@@ -1404,7 +1404,7 @@
If SUFFIXES is non-nil, it should be a list of suffixes to append to
file name when searching.
If non-nil, PREDICATE is used instead of `file-readable-p'.
-PREDICATE can also be an integer to pass to the faccessat(2) function,
+PREDICATE can also be an integer to pass to the access(2) function,
in which case file-name-handlers are ignored.
This function will normally skip directories, so if you want it to find
directories, make sure the PREDICATE function returns `dir-ok' for them. */)
@@ -1442,6 +1442,7 @@
int
openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes, Lisp_Object
*storeptr, Lisp_Object predicate)
{
+ int fd;
ptrdiff_t fn_size = 100;
char buf[100];
char *fn = buf;
@@ -1496,6 +1497,7 @@
{
ptrdiff_t fnlen, lsuffix = SBYTES (XCAR (tail));
Lisp_Object handler;
+ bool exists;
/* Concatenate path element/specified name with the suffix.
If the directory starts with /:, remove that. */
@@ -1519,7 +1521,6 @@
handler = Ffind_file_name_handler (string, Qfile_exists_p);
if ((!NILP (handler) || !NILP (predicate)) && !NATNUMP (predicate))
{
- bool exists;
if (NILP (predicate))
exists = !NILP (Ffile_readable_p (string));
else
@@ -1541,40 +1542,37 @@
}
else
{
- int fd;
+#ifndef WINDOWSNT
+ struct stat st;
+#endif
const char *pfn;
encoded_fn = ENCODE_FILE (string);
pfn = SSDATA (encoded_fn);
+#ifdef WINDOWSNT
+ exists = access (pfn, F_OK) == 0 && access (pfn, D_OK) < 0;
+#else
+ exists = (stat (pfn, &st) == 0 && ! S_ISDIR (st.st_mode));
+#endif
+ if (exists)
+ {
+ /* Check that we can access or open it. */
+ if (NATNUMP (predicate))
+ fd = (((XFASTINT (predicate) & ~INT_MAX) == 0
+ && access (pfn, XFASTINT (predicate)) == 0)
+ ? 1 : -1);
+ else
+ fd = emacs_open (pfn, O_RDONLY, 0);
- /* Check that we can access or open it. */
- if (NATNUMP (predicate))
- fd = (((XFASTINT (predicate) & ~INT_MAX) == 0
- && (faccessat (AT_FDCWD, pfn, XFASTINT (predicate),
- AT_EACCESS)
- == 0)
- && ! file_directory_p (pfn))
- ? 1 : -1);
- else
- {
- struct stat st;
- fd = emacs_open (pfn, O_RDONLY, 0);
- if (0 <= fd
- && (fstat (fd, &st) != 0 || S_ISDIR (st.st_mode)))
+ if (fd >= 0)
{
- emacs_close (fd);
- fd = -1;
+ /* We succeeded; return this descriptor and filename. */
+ if (storeptr)
+ *storeptr = string;
+ UNGCPRO;
+ return fd;
}
}
-
- if (fd >= 0)
- {
- /* We succeeded; return this descriptor and filename. */
- if (storeptr)
- *storeptr = string;
- UNGCPRO;
- return fd;
- }
}
}
if (absolute)
@@ -4090,7 +4088,7 @@
if (STRINGP (dirfile))
{
dirfile = Fdirectory_file_name (dirfile);
- if (faccessat (AT_FDCWD, SSDATA (dirfile), F_OK, AT_EACCESS) != 0)
+ if (access (SSDATA (dirfile), 0) < 0)
dir_warning ("Warning: Lisp directory `%s' does not exist.\n",
XCAR (path_tail));
}
=== modified file 'src/process.c'
--- a/src/process.c 2012-10-19 16:52:02 +0000
+++ b/src/process.c 2012-10-19 19:25:18 +0000
@@ -204,7 +204,7 @@
#ifndef NON_BLOCKING_CONNECT
#ifdef HAVE_SELECT
#if defined (HAVE_GETPEERNAME) || defined (GNU_LINUX)
-#if O_NONBLOCK || O_NDELAY
+#if defined (O_NONBLOCK) || defined (O_NDELAY)
#if defined (EWOULDBLOCK) || defined (EINPROGRESS)
#define NON_BLOCKING_CONNECT
#endif /* EWOULDBLOCK || EINPROGRESS */
@@ -651,7 +651,7 @@
PTY_OPEN;
#else /* no PTY_OPEN */
{
-# if O_NONBLOCK
+# ifdef O_NONBLOCK
fd = emacs_open (pty_name, O_RDWR | O_NONBLOCK, 0);
# else
fd = emacs_open (pty_name, O_RDWR | O_NDELAY, 0);
@@ -668,7 +668,7 @@
#else
sprintf (pty_name, "/dev/tty%c%x", c, i);
#endif /* no PTY_TTY_NAME_SPRINTF */
- if (faccessat (AT_FDCWD, pty_name, R_OK | W_OK, AT_EACCESS) != 0)
+ if (access (pty_name, 6) != 0)
{
emacs_close (fd);
# ifndef __sgi
@@ -1621,7 +1621,7 @@
#if ! defined (USG) || defined (USG_SUBTTY_WORKS)
/* On most USG systems it does not work to open the pty's tty here,
then close it and reopen it in the child. */
-#if O_NOCTTY
+#ifdef O_NOCTTY
/* Don't let this terminal become our controlling terminal
(in case we don't have one). */
forkout = forkin = emacs_open (pty_name, O_RDWR | O_NOCTTY, 0);
@@ -1675,11 +1675,11 @@
}
#endif
-#if O_NONBLOCK
+#ifdef O_NONBLOCK
fcntl (inchannel, F_SETFL, O_NONBLOCK);
fcntl (outchannel, F_SETFL, O_NONBLOCK);
#else
-#if O_NDELAY
+#ifdef O_NDELAY
fcntl (inchannel, F_SETFL, O_NDELAY);
fcntl (outchannel, F_SETFL, O_NDELAY);
#endif
@@ -1967,7 +1967,7 @@
#if ! defined (USG) || defined (USG_SUBTTY_WORKS)
/* On most USG systems it does not work to open the pty's tty here,
then close it and reopen it in the child. */
-#if O_NOCTTY
+#ifdef O_NOCTTY
/* Don't let this terminal become our controlling terminal
(in case we don't have one). */
int forkout = emacs_open (pty_name, O_RDWR | O_NOCTTY, 0);
@@ -1987,11 +1987,11 @@
}
#endif /* HAVE_PTYS */
-#if O_NONBLOCK
+#ifdef O_NONBLOCK
fcntl (inchannel, F_SETFL, O_NONBLOCK);
fcntl (outchannel, F_SETFL, O_NONBLOCK);
#else
-#if O_NDELAY
+#ifdef O_NDELAY
fcntl (inchannel, F_SETFL, O_NDELAY);
fcntl (outchannel, F_SETFL, O_NDELAY);
#endif
@@ -2951,7 +2951,7 @@
{
/* Don't support network sockets when non-blocking mode is
not available, since a blocked Emacs is not useful. */
-#if !O_NONBLOCK && !O_NDELAY
+#if !defined (O_NONBLOCK) && !defined (O_NDELAY)
error ("Network servers not supported");
#else
is_server = 1;
@@ -3217,7 +3217,7 @@
#ifdef NON_BLOCKING_CONNECT
if (is_non_blocking_client)
{
-#if O_NONBLOCK
+#ifdef O_NONBLOCK
ret = fcntl (s, F_SETFL, O_NONBLOCK);
#else
ret = fcntl (s, F_SETFL, O_NDELAY);
@@ -3434,10 +3434,10 @@
chan_process[inch] = proc;
-#if O_NONBLOCK
+#ifdef O_NONBLOCK
fcntl (inch, F_SETFL, O_NONBLOCK);
#else
-#if O_NDELAY
+#ifdef O_NDELAY
fcntl (inch, F_SETFL, O_NDELAY);
#endif
#endif
@@ -4169,10 +4169,10 @@
chan_process[s] = proc;
-#if O_NONBLOCK
+#ifdef O_NONBLOCK
fcntl (s, F_SETFL, O_NONBLOCK);
#else
-#if O_NDELAY
+#ifdef O_NDELAY
fcntl (s, F_SETFL, O_NDELAY);
#endif
#endif
@@ -4873,11 +4873,11 @@
#endif
/* ISC 4.1 defines both EWOULDBLOCK and O_NONBLOCK,
and Emacs uses O_NONBLOCK, so what we get is EAGAIN. */
-#if O_NONBLOCK
+#ifdef O_NONBLOCK
else if (nread == -1 && errno == EAGAIN)
;
#else
-#if O_NDELAY
+#ifdef O_NDELAY
else if (nread == -1 && errno == EAGAIN)
;
/* Note that we cannot distinguish between no input
@@ -7363,7 +7363,7 @@
#ifdef HAVE_GETSOCKNAME
ADD_SUBFEATURE (QCservice, Qt);
#endif
-#if O_NONBLOCK || O_NDELAY
+#if defined (O_NONBLOCK) || defined (O_NDELAY)
ADD_SUBFEATURE (QCserver, Qt);
#endif
=== modified file 'src/sysdep.c'
--- a/src/sysdep.c 2012-10-19 16:52:02 +0000
+++ b/src/sysdep.c 2012-10-19 19:25:18 +0000
@@ -1216,7 +1216,7 @@
old_fcntl_owner[fileno (tty_out->input)]);
}
#endif /* F_SETOWN */
-#if O_NDELAY
+#ifdef O_NDELAY
fcntl (fileno (tty_out->input), F_SETFL,
fcntl (fileno (tty_out->input), F_GETFL, 0) & ~O_NDELAY);
#endif
@@ -2312,12 +2312,12 @@
fd = emacs_open ((char*) port,
O_RDWR
-#if O_NONBLOCK
+#ifdef O_NONBLOCK
| O_NONBLOCK
#else
| O_NDELAY
#endif
-#if O_NOCTTY
+#ifdef O_NOCTTY
| O_NOCTTY
#endif
, 0);
=== modified file 'src/term.c'
--- a/src/term.c 2012-10-19 16:52:02 +0000
+++ b/src/term.c 2012-10-19 19:25:18 +0000
@@ -3023,7 +3023,7 @@
int fd;
FILE *file;
-#if O_IGNORE_CTTY
+#ifdef O_IGNORE_CTTY
if (!ctty)
/* Open the terminal device. Don't recognize it as our
controlling terminal, and don't make it the controlling tty
@@ -3054,7 +3054,7 @@
name);
}
-#if !O_IGNORE_CTTY
+#ifndef O_IGNORE_CTTY
if (!ctty)
dissociate_if_controlling_tty (fd);
#endif
=== modified file 'src/w32.c'
--- a/src/w32.c 2012-10-19 16:52:02 +0000
+++ b/src/w32.c 2012-10-19 19:25:18 +0000
@@ -1597,7 +1597,7 @@
see if it succeeds. But I think that's too much to ask. */
/* MSVCRT's _access crashes with D_OK. */
- if (tmp && sys_faccessat (AT_FDCWD, tmp, D_OK, AT_EACCESS) == 0)
+ if (tmp && sys_access (tmp, D_OK) == 0)
{
char * var = alloca (strlen (tmp) + 8);
sprintf (var, "TMPDIR=%s", tmp);
@@ -2714,16 +2714,10 @@
long file names. */
int
-sys_faccessat (int dirfd, const char * path, int mode, int flags)
+sys_access (const char * path, int mode)
{
DWORD attributes;
- if (dirfd != AT_FDCWD)
- {
- errno = EINVAL;
- return -1;
- }
-
/* MSVCRT implementation of 'access' doesn't recognize D_OK, and its
newer versions blow up when passed D_OK. */
path = map_w32_filename (path, NULL);
@@ -2966,7 +2960,7 @@
{
int save_errno = errno;
p[0] = first_char[i];
- if (sys_faccessat (AT_FDCWD, template, F_OK, AT_EACCESS) < 0)
+ if (sys_access (template, 0) < 0)
{
errno = save_errno;
return template;
@@ -4017,7 +4011,7 @@
{
/* Non-absolute FILENAME is understood as being relative to
LINKNAME's directory. We need to prepend that directory to
- FILENAME to get correct results from sys_faccessat below, since
+ FILENAME to get correct results from sys_access below, since
otherwise it will interpret FILENAME relative to the
directory where the Emacs process runs. Note that
make-symbolic-link always makes sure LINKNAME is a fully
@@ -4031,10 +4025,10 @@
strncpy (tem, linkfn, p - linkfn);
tem[p - linkfn] = '\0';
strcat (tem, filename);
- dir_access = sys_faccessat (AT_FDCWD, tem, D_OK, AT_EACCESS);
+ dir_access = sys_access (tem, D_OK);
}
else
- dir_access = sys_faccessat (AT_FDCWD, filename, D_OK, AT_EACCESS);
+ dir_access = sys_access (filename, D_OK);
/* Since Windows distinguishes between symlinks to directories and
to files, we provide a kludgy feature: if FILENAME doesn't
=== modified file 'src/xrdb.c'
--- a/src/xrdb.c 2012-10-19 16:52:02 +0000
+++ b/src/xrdb.c 2012-10-19 19:25:18 +0000
@@ -21,7 +21,6 @@
#include <config.h>
-#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
#include <epaths.h>
@@ -262,8 +261,11 @@
static int
file_p (const char *filename)
{
- return (faccessat (AT_FDCWD, filename, R_OK, AT_EACCESS) == 0
- && ! file_directory_p (filename));
+ struct stat status;
+
+ return (access (filename, 4) == 0 /* exists and is readable */
+ && stat (filename, &status) == 0 /* get the status */
+ && (S_ISDIR (status.st_mode)) == 0); /* not a directory */
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110594: Undo faccessat change.,
Paul Eggert <=