[Bug-gnulib] euidaccess merge from coreutils

[Paul Eggert]

I merged the following changes from coreutils for euidaccess.

2003-08-12  Paul Eggert  <address@hidden>

        Merge from coreutils.
        * modules/euidaccess: Add lib_SOURCES, include for new
        file euidaccess.h
        * lib/euidaccess.h: New file.
        * lib/euidaccess.c: Include it.
        * m4/euidaccess.m4 (gl_FUNC_EUIDACCESS): Check for euidaccess decl.

--- /dev/null   Tue Mar 18 13:55:57 2003
+++ lib/euidaccess.h    Mon Aug 11 11:26:32 2003
@@ -0,0 +1,3 @@
+#if ! HAVE_DECL_EUIDACCESS
+int euidaccess (char const *file, int mode);
+#endif
Index: lib/euidaccess.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/euidaccess.c,v
retrieving revision 1.13
diff -p -u -r1.13 euidaccess.c
--- lib/euidaccess.c    9 Jul 2003 22:48:53 -0000       1.13
+++ lib/euidaccess.c    12 Aug 2003 23:35:49 -0000
@@ -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
@@ -21,6 +24,10 @@
 
 #if HAVE_CONFIG_H
 # include <config.h>
+#endif
+
+#ifndef _LIBC
+# include "euidaccess.h"
 #endif
 
 #include <sys/types.h>
Index: m4/euidaccess.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/euidaccess.m4,v
retrieving revision 1.1
diff -p -u -r1.1 euidaccess.m4
--- m4/euidaccess.m4    31 Dec 2002 13:42:06 -0000      1.1
+++ m4/euidaccess.m4    12 Aug 2003 23:35:49 -0000
@@ -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
Index: modules/euidaccess
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/euidaccess,v
retrieving revision 1.3
diff -p -u -r1.3 euidaccess
--- modules/euidaccess  20 Jan 2003 10:02:37 -0000      1.3
+++ modules/euidaccess  12 Aug 2003 23:35:49 -0000
@@ -12,8 +12,10 @@ configure.ac:
 gl_FUNC_EUIDACCESS
 
 Makefile.am:
+lib_SOURCES += euidaccess.h
 
 Include:
+"euidaccess.h"
 
 Maintainer:
 Jim Meyering, glibc