changeset 4531:67c56a27d86c

Merge euidaccess etc. from coreutils.
author Paul Eggert <eggert@cs.ucla.edu>
date Tue, 12 Aug 2003 23:39:50 +0000
parents 766b2a179aae
children a0e9d504cac5
files ChangeLog lib/ChangeLog lib/euidaccess.c lib/euidaccess.h m4/ChangeLog m4/euidaccess.m4 modules/euidaccess
diffstat 7 files changed, 34 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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:
--- 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.
--- 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>
 
new file mode 100644
--- /dev/null
+++ b/lib/euidaccess.h
@@ -0,0 +1,3 @@
+#if ! HAVE_DECL_EUIDACCESS
+int euidaccess (char const *file, int mode);
+#endif
--- 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.
--- 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 @@
   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
--- a/modules/euidaccess
+++ b/modules/euidaccess
@@ -12,8 +12,10 @@
 gl_FUNC_EUIDACCESS
 
 Makefile.am:
+lib_SOURCES += euidaccess.h
 
 Include:
+"euidaccess.h"
 
 Maintainer:
 Jim Meyering, glibc