New module 'environ'.

diff --git a/ChangeLog b/ChangeLog
index 926aea507b40702be877fe0f139f7026a5dc7c0e..36e7e06e4376f550e08d194602062575297cf0ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2008-02-24  Bruno Haible  <bruno@clisp.org>
+
+       New module 'environ'.
+       * modules/environ: New file.
+       * lib/unistd.in.h (environ): New declaration.
+       * m4/environ.m4: New file.
+       (gt_CHECK_VAR_DECL): Moved here from m4/setenv.m4. Undefine gt_cv_var
+       after use.
+       * m4/unistd_h.m4 (gl_UNISTD_H_DEFAULTS): Initialize GNULIB_ENVIRON and
+       HAVE_DECL_ENVIRON.
+       * modules/unistd (Makefile.am): Substitute also GNULIB_ENVIRON and
+       HAVE_DECL_ENVIRON.
+       * doc/posix-functions/environ.texi: Mention module 'environ'. Remove
+       wrong claim that 'environ' is missing on some systems.
+       * modules/execute (Depends-on): Add environ.
+       * lib/execute.c (environ): Remove fallback declaration.
+       * modules/pipe (Depends-on): Add environ.
+       * lib/pipe.c (environ): Remove fallback declaration.
+       * modules/setenv (Depends-on): Add environ.
+       * lib/setenv.c (environ): Remove fallback declaration.
+       * modules/unsetenv (Depends-on): Add environ.
+       * lib/unsetenv.c (environ): Remove fallback declaration.
+       * m4/setenv.m4 (gt_CHECK_VAR_DECL): Remove macro. Moved to
+       m4/environ.m4.
+       (gl_PREREQ_SETENV): Require gl_ENVIRON instead of testing for environ.
+       (gl_PREREQ_UNSETENV): Likewise.
+
 2008-02-24  Bruno Haible  <bruno@clisp.org>
 
        * doc/posix-functions/environ.texi: Document the MacOS X problem.

diff --git a/doc/posix-functions/environ.texi b/doc/posix-functions/environ.texi
index ba027d90ac231ad3d272deb51e7fe7e712f39bfc..e4100fb879516d6daef651de0f950ce4eda566d3 100644 (file)
--- a/doc/posix-functions/environ.texi
+++ b/doc/posix-functions/environ.texi
@@ -4,17 +4,14 @@
 
 POSIX specification: @url{http://www.opengroup.org/susv3xsh/environ.html}
 
-Gnulib module: ---
+Gnulib module: environ
 
 Portability problems fixed by Gnulib:
 @itemize
-@end itemize
-
-Portability problems not fixed by Gnulib:
-@itemize
 @item
-This variable is missing on some platforms:
-MacOS X 10.3, FreeBSD 6.0, NetBSD 3.0, OpenBSD 3.8, IRIX 6.5, OSF/1 5.1, Cygwin.
+POSIX does not require this variable to be declared, and it is indeed not
+declared on some platforms:
+MacOS X 10.3, FreeBSD 6.0, NetBSD 3.0, OpenBSD 3.8, IRIX 6.5, Solaris 10.
 @item
 On MacOS X 10, this variable is not declared.  Up to MacOS X 10.4, one can use
 @smallexample
@@ -27,6 +24,10 @@ shared libraries on MacOS X 10.5.  Here is a workaround: Instead, one can use
 #define environ (*_NSGetEnviron())
 @end smallexample
 This works at least on MacOS X 10.3 and newer.
+@end itemize
+
+Portability problems not fixed by Gnulib:
+@itemize
 @item
 The address of this variable is not a compile-time constant on some platforms:
 mingw.

diff --git a/lib/execute.c b/lib/execute.c
index 30ce0009aa0759b189e55eee87ce027a90e975e2..cfac1962dff3ed60182e06032ab591376eece4b4 100644 (file)
--- a/lib/execute.c
+++ b/lib/execute.c
@@ -1,5 +1,5 @@
 /* Creation of autonomous subprocesses.
-   Copyright (C) 2001-2004, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2008 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -54,10 +54,6 @@
 
 #endif
 
-#if ! HAVE_ENVIRON_DECL
-extern char **environ;
-#endif
-
 #ifndef STDIN_FILENO
 # define STDIN_FILENO 0
 #endif

diff --git a/lib/pipe.c b/lib/pipe.c
index f10cc95fe51f1eaa65d8e38b15e5d4992f2db6f2..e62d137e03ef69eeace1a413479269feb612abd6 100644 (file)
--- a/lib/pipe.c
+++ b/lib/pipe.c
@@ -1,5 +1,5 @@
 /* Creation of subprocesses, communicating via pipes.
-   Copyright (C) 2001-2004, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2008 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -53,10 +53,6 @@
 
 #endif
 
-#if ! HAVE_ENVIRON_DECL
-extern char **environ;
-#endif
-
 #ifndef STDIN_FILENO
 # define STDIN_FILENO 0
 #endif

diff --git a/lib/setenv.c b/lib/setenv.c
index ea1d1167ff1d89282bd180276da658669fe9e3c1..83b52b88b980a297ca1944746be527eeeee79ad8 100644 (file)
--- a/lib/setenv.c
+++ b/lib/setenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1995-1999,2000-2003,2005-2007 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1995-1999,2000-2003,2005-2008 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
@@ -40,9 +40,6 @@
 
 #if !_LIBC
 # define __environ     environ
-# ifndef HAVE_ENVIRON_DECL
-extern char **environ;
-# endif
 #endif
 
 #if _LIBC

diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index 5400c86367df4879754fbe760b0cc6867ac01d9b..346b8b4beea1b7c3c49dbc9e4f9a8a97605d8607 100644 (file)
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <unistd.h>.
-   Copyright (C) 2004-2007 Free Software Foundation, Inc.
+   Copyright (C) 2004-2008 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
@@ -86,6 +86,26 @@ extern int dup2 (int oldfd, int newfd);
 #endif
 
 
+#if @GNULIB_ENVIRON@
+# if !@HAVE_DECL_ENVIRON@
+/* Set of environment variables and values.  An array of strings of the form
+   "VARIABLE=VALUE", terminated with a NULL.  */
+#  if defined __APPLE__ && defined __MACH__
+#   include <crt_externs.h>
+#   define environ (*_NSGetEnviron ())
+#  else
+extern char **environ;
+#  endif
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef environ
+# define environ \
+    (GL_LINK_WARNING ("environ is unportable - " \
+                      "use gnulib module environ for portability"), \
+     environ)
+#endif
+
+
 #if @GNULIB_FCHDIR@
 # if @REPLACE_FCHDIR@
 

diff --git a/lib/unsetenv.c b/lib/unsetenv.c
index c783997a2b50105389fd41377cbc623c5e4e55d5..73ea878a688c52bc7d0063cb7096fef2704faed9 100644 (file)
--- a/lib/unsetenv.c
+++ b/lib/unsetenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1995-1999,2000-2002,2005-2007 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1995-1999,2000-2002,2005-2008 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
@@ -29,9 +29,6 @@
 
 #if !_LIBC
 # define __environ     environ
-# ifndef HAVE_ENVIRON_DECL
-extern char **environ;
-# endif
 #endif
 
 #if _LIBC

diff --git a/m4/environ.m4 b/m4/environ.m4
new file mode 100644 (file)
index 0000000..fac0c05
--- /dev/null
+++ b/m4/environ.m4
@@ -0,0 +1,36 @@
+# environ.m4 serial 1
+dnl Copyright (C) 2001-2004, 2006-2008 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_ENVIRON],
+[
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+  dnl Persuade glibc <unistd.h> to declare environ.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  gt_CHECK_VAR_DECL([#include <unistd.h>], environ)
+  if test $gt_cv_var_environ_declaration != yes; then
+    HAVE_DECL_ENVIRON=0
+  fi
+])
+
+# Check if a variable is properly declared.
+# gt_CHECK_VAR_DECL(includes,variable)
+AC_DEFUN([gt_CHECK_VAR_DECL],
+[
+  define([gt_cv_var], [gt_cv_var_]$2[_declaration])
+  AC_MSG_CHECKING([if $2 is properly declared])
+  AC_CACHE_VAL(gt_cv_var, [
+    AC_TRY_COMPILE([$1
+      extern struct { int foo; } $2;],
+      [$2.foo = 1;],
+      gt_cv_var=no,
+      gt_cv_var=yes)])
+  AC_MSG_RESULT($gt_cv_var)
+  if test $gt_cv_var = yes; then
+    AC_DEFINE([HAVE_]translit($2, [a-z], [A-Z])[_DECL], 1,
+              [Define if you have the declaration of $2.])
+  fi
+  undefine([gt_cv_var])
+])

diff --git a/m4/setenv.m4 b/m4/setenv.m4
index bbb5548ffa6c8aeca7f695c4340be24cf183b92c..7af13d724163c4e5a6ba4071365a929b5a496762 100644 (file)
--- a/m4/setenv.m4
+++ b/m4/setenv.m4
@@ -1,5 +1,5 @@
-# setenv.m4 serial 9
-dnl Copyright (C) 2001-2004, 2006-2007 Free Software Foundation, Inc.
+# setenv.m4 serial 10
+dnl Copyright (C) 2001-2004, 2006-2008 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.
@@ -53,38 +53,19 @@ int unsetenv();
   fi
 ])
 
-# Check if a variable is properly declared.
-# gt_CHECK_VAR_DECL(includes,variable)
-AC_DEFUN([gt_CHECK_VAR_DECL],
-[
-  define([gt_cv_var], [gt_cv_var_]$2[_declaration])
-  AC_MSG_CHECKING([if $2 is properly declared])
-  AC_CACHE_VAL(gt_cv_var, [
-    AC_TRY_COMPILE([$1
-      extern struct { int foo; } $2;],
-      [$2.foo = 1;],
-      gt_cv_var=no,
-      gt_cv_var=yes)])
-  AC_MSG_RESULT($gt_cv_var)
-  if test $gt_cv_var = yes; then
-    AC_DEFINE([HAVE_]translit($2, [a-z], [A-Z])[_DECL], 1,
-              [Define if you have the declaration of $2.])
-  fi
-])
-
 # Prerequisites of lib/setenv.c.
 AC_DEFUN([gl_PREREQ_SETENV],
 [
   AC_REQUIRE([AC_FUNC_ALLOCA])
+  AC_REQUIRE([gl_ENVIRON])
   AC_CHECK_HEADERS_ONCE(unistd.h)
   AC_CHECK_HEADERS(search.h)
   AC_CHECK_FUNCS(tsearch)
-  gt_CHECK_VAR_DECL([#include <unistd.h>], environ)
 ])
 
 # Prerequisites of lib/unsetenv.c.
 AC_DEFUN([gl_PREREQ_UNSETENV],
 [
+  AC_REQUIRE([gl_ENVIRON])
   AC_CHECK_HEADERS_ONCE(unistd.h)
-  gt_CHECK_VAR_DECL([#include <unistd.h>], environ)
 ])

diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4
index 4b8857ca5bba04f307e39ac3fec537b3855f336c..e8ccab16e837659cb30099432991a810bd7698cf 100644 (file)
--- a/m4/unistd_h.m4
+++ b/m4/unistd_h.m4
@@ -1,5 +1,5 @@
-# unistd_h.m4 serial 10
-dnl Copyright (C) 2006-2007 Free Software Foundation, Inc.
+# unistd_h.m4 serial 11
+dnl Copyright (C) 2006-2008 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.
@@ -34,6 +34,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
 [
   GNULIB_CHOWN=0;         AC_SUBST([GNULIB_CHOWN])
   GNULIB_DUP2=0;          AC_SUBST([GNULIB_DUP2])
+  GNULIB_ENVIRON=0;       AC_SUBST([GNULIB_ENVIRON])
   GNULIB_FCHDIR=0;        AC_SUBST([GNULIB_FCHDIR])
   GNULIB_FTRUNCATE=0;     AC_SUBST([GNULIB_FTRUNCATE])
   GNULIB_GETCWD=0;        AC_SUBST([GNULIB_GETCWD])
@@ -49,6 +50,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   HAVE_GETPAGESIZE=1;     AC_SUBST([HAVE_GETPAGESIZE])
   HAVE_READLINK=1;        AC_SUBST([HAVE_READLINK])
   HAVE_SLEEP=1;           AC_SUBST([HAVE_SLEEP])
+  HAVE_DECL_ENVIRON=1;    AC_SUBST([HAVE_DECL_ENVIRON])
   HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R])
   HAVE_OS_H=0;            AC_SUBST([HAVE_OS_H])
   HAVE_SYS_PARAM_H=0;     AC_SUBST([HAVE_SYS_PARAM_H])

diff --git a/modules/environ b/modules/environ
new file mode 100644 (file)
index 0000000..3057619
--- /dev/null
+++ b/modules/environ
@@ -0,0 +1,24 @@
+Description:
+environ variable: storage of environment variables.
+
+Files:
+m4/environ.m4
+
+Depends-on:
+unistd
+
+configure.ac:
+gl_ENVIRON
+gl_UNISTD_MODULE_INDICATOR([environ])
+
+Makefile.am:
+
+Include:
+#include <unistd.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+Bruno Haible
+

diff --git a/modules/execute b/modules/execute
index 00f186101e635d85d40ecf515f15b51f45c44ebe..d5f6ce6cf4aedf3bf9959dbc444a83d5cab3b909 100644 (file)
--- a/modules/execute
+++ b/modules/execute
@@ -16,6 +16,7 @@ gettext-h
 stdbool
 strpbrk
 unistd
+environ
 
 configure.ac:
 gl_EXECUTE

diff --git a/modules/pipe b/modules/pipe
index 0aab325f149750d6ac9fbaab4dad32fa5475fae0..aef9389aaa15a925f136ffc7a93d04eef0e98445 100644 (file)
--- a/modules/pipe
+++ b/modules/pipe
@@ -16,6 +16,7 @@ gettext-h
 stdbool
 strpbrk
 unistd
+environ
 
 configure.ac:
 gl_PIPE

diff --git a/modules/setenv b/modules/setenv
index 1c93bfb5c0842c359221e8748522fa2bfbd389bf..0458c388d41257ca2bb771185403e08cf72500c8 100644 (file)
--- a/modules/setenv
+++ b/modules/setenv
@@ -10,6 +10,7 @@ stdlib
 malloca
 alloca-opt
 unistd
+environ
 
 configure.ac:
 gl_FUNC_SETENV

diff --git a/modules/unistd b/modules/unistd
index 4d16cf3abed647cc9f374d3eb34a87bd7bf55947..88fc993c89678e25567e75f1f8f2ac1a5a9a4951 100644 (file)
--- a/modules/unistd
+++ b/modules/unistd
@@ -25,6 +25,7 @@ unistd.h: unistd.in.h
              -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
              -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \
              -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \
+             -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \
              -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \
              -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \
              -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \
@@ -39,6 +40,7 @@ unistd.h: unistd.in.h
              -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
              -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
              -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
+             -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
              -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
              -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
              -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \

diff --git a/modules/unsetenv b/modules/unsetenv
index 261c8e4d65403bcff594348198348761f8007707..6dff883c716926da8e35805196bdb83df6ed2a73 100644 (file)
--- a/modules/unsetenv
+++ b/modules/unsetenv
@@ -8,6 +8,7 @@ m4/setenv.m4
 Depends-on:
 stdlib
 unistd
+environ
 
 configure.ac:
 gl_FUNC_UNSETENV