Merge euidaccess etc. from coreutils.

diff --git a/ChangeLog b/ChangeLog
index 5e097744dd7cb0853996089347e3a932ce9eec11..66e8fd067848f905ca3a225f2c6ebe3a9d714375 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-12  Paul Eggert  <eggert@twinsun.com>
+
+       Merge from coreutils.
+       * modules/euidaccess: Add lib_SOURCES, include for new
+       file euidaccess.h
+
 2003-08-11  Paul Eggert  <eggert@twinsun.com>
 
        * modules/gnu-source, m4/gnu-source.m4:

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 451a2249f1a03e0d5424a9efe4b42e156620963c..37e345cc37d1d544827f8189bf364f8b9b98609a 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-12  Paul Eggert  <eggert@twinsun.com>
+
+       Merge from coreutils.
+       * euidaccess.h: New file.
+       * euidaccess.c: Include it.
+       * .cppi-disable: Add printf-args.h, printf-parse.h, stdbool_.h,
+       vasnprintf.h, vasprintf.h.  Remove strdup.c, gettext.h.
+       * regex.h, strdup.c, strtoll.c, strtoul.c: Normalize white space.
+       
 2003-08-11  Bruno Haible  <bruno@clisp.org>
 
        * vasnprintf.c (local_wcslen): New function, for Solaris 2.5.1.

diff --git a/lib/euidaccess.c b/lib/euidaccess.c
index c78040a30b35a03b6ebf966bf82cbf2b736403c4..16026c225807bb5e7b996b78ad7706461b8c948c 100644 (file)
--- a/lib/euidaccess.c
+++ b/lib/euidaccess.c
@@ -1,5 +1,8 @@
 /* euidaccess -- check if effective user id can access file
-   Copyright (C) 1990, 1991, 1995, 1998, 2000 Free Software Foundation, Inc.
+
+   Copyright (C) 1990, 1991, 1995, 1998, 2000, 2003 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
@@ -23,6 +26,10 @@
 # include <config.h>
 #endif
 
+#ifndef _LIBC
+# include "euidaccess.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 

diff --git a/lib/euidaccess.h b/lib/euidaccess.h
new file mode 100644 (file)
index 0000000..17b7e98
--- /dev/null
+++ b/lib/euidaccess.h
@@ -0,0 +1,3 @@
+#if ! HAVE_DECL_EUIDACCESS
+int euidaccess (char const *file, int mode);
+#endif

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 4c66c4f249ec72fb4a0307e501eaeddd221eb861..88fab442be835083c6fca2453cf33b13598e1a35 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,5 +1,8 @@
 2003-08-12  Paul Eggert  <eggert@twinsun.com>
 
+       Merge from coreutils
+       * euidaccess.m4 (gl_FUNC_EUIDACCESS): Check for euidaccess decl.
+
        * lib-ld.m4, lib-link.m4, lib-prefix.m4: Regenerate from gettext
        0.12.1.  These files are now being upgraded automatically by
        ../config/srclist-update.

diff --git a/m4/euidaccess.m4 b/m4/euidaccess.m4
index 565a0903fd77a2d6072fb7e1a8f21888156a248f..18ce475b117d7db9f99f43642a3ee92585f8820c 100644 (file)
--- a/m4/euidaccess.m4
+++ b/m4/euidaccess.m4
@@ -1,5 +1,5 @@
-# euidaccess.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# euidaccess.m4 serial 2
+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -11,6 +11,7 @@ AC_DEFUN([gl_FUNC_EUIDACCESS],
   dnl Persuade glibc <unistd.h> to declare euidaccess().
   AC_REQUIRE([AC_GNU_SOURCE])
 
+  AC_CHECK_DECLS([euidaccess])
   AC_REPLACE_FUNCS(euidaccess)
   if test $ac_cv_func_euidaccess = no; then
     gl_PREREQ_EUIDACCESS

diff --git a/modules/euidaccess b/modules/euidaccess
index cb14d6359d76fd90fb712320544817c8276befa7..19f2da357cdbc4c14d0b36ea5fd0e2d7e4485deb 100644 (file)
--- a/modules/euidaccess
+++ b/modules/euidaccess
@@ -12,8 +12,10 @@ configure.ac:
 gl_FUNC_EUIDACCESS
 
 Makefile.am:
+lib_SOURCES += euidaccess.h
 
 Include:
+"euidaccess.h"
 
 Maintainer:
 Jim Meyering, glibc