unistd: guarantee STDIN_FILENO here, for OS/2 EMX

* lib/unistd.in.h (STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO):
Guarantee a definition.
* doc/posix-headers/unistd.texi (unistd.h): Document the bug.
* modules/unistd-safer (Depends-on): Add dependency on unistd.
* lib/c-stack.c (STDERR_FILENO): Rely on <unistd.h>.
* lib/dup-safer.c (STDERR_FILENO): Likewise.
* lib/execute.c (STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO):
Likewise.
* lib/fd-safer.c (STDIN_FILENO, STDERR_FILENO): Likewise.
* lib/fopen-safer.c (STDERR_FILENO): Likewise.
* lib/pipe.c (STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO):
Likewise.
* lib/tmpfile-safer.c (STDERR_FILENO): Likewise.
* tests/test-posix_spawn1.c (STDIN_FILENO, STDOUT_FILENO)
(STDERR_FILENO): Likewise.
* tests/test-posix_spawn2.c (STDIN_FILENO, STDOUT_FILENO)
(STDERR_FILENO): Likewise.
* tests/test-posix_spawn3.c (STDIN_FILENO, STDOUT_FILENO)
(STDERR_FILENO): Likewise.
Reported by Elbert Pol.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 12adb30e0d2dd26cb5a6779adb4c9eb562efb3f6..22ad726a0e4bc68f84daf86c7d2cad5b70cc18f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2009-01-19  Eric Blake  <ebb9@byu.net>
+
+       unistd: guarantee STDIN_FILENO here, for OS/2 EMX
+       * lib/unistd.in.h (STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO):
+       Guarantee a definition.
+       * doc/posix-headers/unistd.texi (unistd.h): Document the bug.
+       * modules/unistd-safer (Depends-on): Add dependency on unistd.
+       * lib/c-stack.c (STDERR_FILENO): Rely on <unistd.h>.
+       * lib/dup-safer.c (STDERR_FILENO): Likewise.
+       * lib/execute.c (STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO):
+       Likewise.
+       * lib/fd-safer.c (STDIN_FILENO, STDERR_FILENO): Likewise.
+       * lib/fopen-safer.c (STDERR_FILENO): Likewise.
+       * lib/pipe.c (STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO):
+       Likewise.
+       * lib/tmpfile-safer.c (STDERR_FILENO): Likewise.
+       * tests/test-posix_spawn1.c (STDIN_FILENO, STDOUT_FILENO)
+       (STDERR_FILENO): Likewise.
+       * tests/test-posix_spawn2.c (STDIN_FILENO, STDOUT_FILENO)
+       (STDERR_FILENO): Likewise.
+       * tests/test-posix_spawn3.c (STDIN_FILENO, STDOUT_FILENO)
+       (STDERR_FILENO): Likewise.
+       Reported by Elbert Pol.
+
 2009-01-19  Eric Blake  <ebb9@byu.net>
 
        doc: mention more functions added in cygwin 1.7.0

diff --git a/doc/posix-headers/unistd.texi b/doc/posix-headers/unistd.texi
index b4336a6bb8445f0510ac9065fe222425c920c30b..855eefbbee47b5adb23cc4073741c4026113ddc3 100644 (file)
--- a/doc/posix-headers/unistd.texi
+++ b/doc/posix-headers/unistd.texi
@@ -10,7 +10,11 @@ Portability problems fixed by Gnulib:
 @item
 This header file is missing on some platforms: msvc.
 @item
-The SEEK_* macros are not defined in this file on some platforms: mingw.
+The SEEK_* macros are not defined in this file on some platforms:
+mingw.
+@item
+The *_FILENO macros are not defined in this file on some platforms:
+OS/2 EMX, mingw.
 @item
 The @code{_exit} function is not declared in this file on some platforms:
 mingw.

diff --git a/lib/c-stack.c b/lib/c-stack.c
index 023f8479ae3219fd111931c060bf8aef4047cb63..e5e3ab610dc5c45b0adfa9ec0ccd44bb4e494149 100644 (file)
--- a/lib/c-stack.c
+++ b/lib/c-stack.c
@@ -1,6 +1,7 @@
 /* Stack overflow handling.
 
-   Copyright (C) 2002, 2004, 2006, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2006, 2008, 2009 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
@@ -67,9 +68,6 @@ typedef struct sigaltstack stack_t;
 #endif
 
 #include <unistd.h>
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
 
 #if HAVE_LIBSIGSEGV
 # include <sigsegv.h>

diff --git a/lib/dup-safer.c b/lib/dup-safer.c
index a6908511ac85f758625a336a5ef77f93fa70e506..7d9b2be349035c40b2277dd2367b07e37b9bb37e 100644 (file)
--- a/lib/dup-safer.c
+++ b/lib/dup-safer.c
@@ -1,6 +1,7 @@
 /* Invoke dup, but avoid some glitches.
 
-   Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004, 2005, 2006, 2009 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
@@ -24,9 +25,6 @@
 #include <fcntl.h>
 
 #include <unistd.h>
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
 
 /* Like dup, but do not return STDIN_FILENO, STDOUT_FILENO, or
    STDERR_FILENO.  */

diff --git a/lib/execute.c b/lib/execute.c
index 231f467380346bdfa1d9bf3eef3062b4527f99e4..71da46fb79d60c193fd455470103d6588f960d85 100644 (file)
--- a/lib/execute.c
+++ b/lib/execute.c
@@ -1,5 +1,5 @@
 /* Creation of autonomous subprocesses.
-   Copyright (C) 2001-2004, 2006-2008 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2009 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,16 +54,6 @@
 
 #endif
 
-#ifndef STDIN_FILENO
-# define STDIN_FILENO 0
-#endif
-#ifndef STDOUT_FILENO
-# define STDOUT_FILENO 1
-#endif
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
-
 /* The results of open() in this file are not used with fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 #undef open

diff --git a/lib/fd-safer.c b/lib/fd-safer.c
index df38c8f7e8e7cecdfa3b1c1a689d767fa0791839..fb9900180ee1e8e2f14bd83830287df8e1d5ef91 100644 (file)
--- a/lib/fd-safer.c
+++ b/lib/fd-safer.c
@@ -1,6 +1,6 @@
 /* Return a safer copy of a file descriptor.
 
-   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2009 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
@@ -24,12 +24,6 @@
 #include <errno.h>
 
 #include <unistd.h>
-#ifndef STDIN_FILENO
-# define STDIN_FILENO 0
-#endif
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
 
 /* Return FD, unless FD would be a copy of standard input, output, or
    error; in that case, return a duplicate of FD, closing FD.  On

diff --git a/lib/fopen-safer.c b/lib/fopen-safer.c
index 55991a2553e6bd9be887e9dab3b524dfd752dc31..9c799223715fd436f8d90b5b729f0f39c0f9e9c9 100644 (file)
--- a/lib/fopen-safer.c
+++ b/lib/fopen-safer.c
@@ -1,6 +1,7 @@
 /* Invoke fopen, but avoid some glitches.
 
-   Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004, 2005, 2006, 2009 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
@@ -25,10 +26,6 @@
 #include <unistd.h>
 #include "unistd-safer.h"
 
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
-
 /* Like fopen, but do not return stdin, stdout, or stderr.  */
 
 FILE *

diff --git a/lib/pipe.c b/lib/pipe.c
index 05bd4ece6825508c3b96cf5361f5cd4a15637e6a..d842c77f9c31bc71d6b4fbdfc1cb5abd93aa9121 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-2008 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2009 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,16 +54,6 @@
 
 #endif
 
-#ifndef STDIN_FILENO
-# define STDIN_FILENO 0
-#endif
-#ifndef STDOUT_FILENO
-# define STDOUT_FILENO 1
-#endif
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
-
 /* The results of open() in this file are not used with fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 #undef open

diff --git a/lib/tmpfile-safer.c b/lib/tmpfile-safer.c
index eec401a40876621784d7b39cf1292bf4946e7c65..e8d05aec367b1efb33cb07016ae216c2012ee868 100644 (file)
--- a/lib/tmpfile-safer.c
+++ b/lib/tmpfile-safer.c
@@ -1,5 +1,5 @@
 /* Invoke tmpfile, but avoid some glitches.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009 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
@@ -26,10 +26,6 @@
 
 #include "binary-io.h"
 
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
-
 /* Like tmpfile, but do not return stdin, stdout, or stderr.
 
    Remember that tmpfile can leave files behind if your program calls _exit,

diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index 52db71c0ff4bb2c49483dfbd5491d062db1faaf4..d8276b1e1885fbb36a5e45d382963ff341ba91c4 100644 (file)
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -29,7 +29,7 @@
 #ifndef _GL_UNISTD_H
 #define _GL_UNISTD_H
 
-/* mingw doesn't define the SEEK_* macros in <unistd.h>.  */
+/* mingw doesn't define the SEEK_* or *_FILENO macros in <unistd.h>.  */
 #if !(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET)
 # include <stdio.h>
 #endif
@@ -87,6 +87,17 @@
 /* The definition of GL_LINK_WARNING is copied here.  */
 
 
+/* OS/2 EMX lacks these macros.  */
+#ifndef STDIN_FILENO
+# define STDIN_FILENO 0
+#endif
+#ifndef STDOUT_FILENO
+# define STDOUT_FILENO 1
+#endif
+#ifndef STDERR_FILENO
+# define STDERR_FILENO 2
+#endif
+
 /* Declare overridden functions.  */
 
 #ifdef __cplusplus

diff --git a/modules/unistd-safer b/modules/unistd-safer
index 4f167e4b240072633773df27e556b16e441a0258..86e23abe03fadbbedcc0ae7671c059fce4857169 100644 (file)
--- a/modules/unistd-safer
+++ b/modules/unistd-safer
@@ -10,6 +10,7 @@ lib/unistd-safer.h
 m4/unistd-safer.m4
 
 Depends-on:
+unistd
 
 configure.ac:
 gl_UNISTD_SAFER

diff --git a/tests/test-posix_spawn1.c b/tests/test-posix_spawn1.c
index 0c30b88d2b4d9f1ca6b2612a4a3a6236f3b7d9c9..d3951ebae12413ab87b4e30583474dc8ac584506 100644 (file)
--- a/tests/test-posix_spawn1.c
+++ b/tests/test-posix_spawn1.c
@@ -1,5 +1,5 @@
 /* Test of posix_spawn() function.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009 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
@@ -33,16 +33,6 @@
 
 extern char **environ;
 
-#ifndef STDIN_FILENO
-# define STDIN_FILENO 0
-#endif
-#ifndef STDOUT_FILENO
-# define STDOUT_FILENO 1
-#endif
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
-
 #define CHILD_PROGRAM_FILENAME "test-posix_spawn1.sh"
 
 static int

diff --git a/tests/test-posix_spawn2.c b/tests/test-posix_spawn2.c
index 826d38b969c6495897fb89cf30ed121e388246ed..ca57713e4096211aa54e171bf0377b67b31ae291 100644 (file)
--- a/tests/test-posix_spawn2.c
+++ b/tests/test-posix_spawn2.c
@@ -1,5 +1,5 @@
 /* Test of posix_spawn() function.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009 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
@@ -33,16 +33,6 @@
 
 extern char **environ;
 
-#ifndef STDIN_FILENO
-# define STDIN_FILENO 0
-#endif
-#ifndef STDOUT_FILENO
-# define STDOUT_FILENO 1
-#endif
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
-
 #define CHILD_PROGRAM_FILENAME "test-posix_spawn2.sh"
 
 static int

diff --git a/tests/test-posix_spawn3.c b/tests/test-posix_spawn3.c
index ec5d46826bd27c367491cd64a162f4143aa2b5f6..af71068fe2fe26520c9a36294c0b1741ad0a9fc2 100644 (file)
--- a/tests/test-posix_spawn3.c
+++ b/tests/test-posix_spawn3.c
@@ -1,5 +1,5 @@
 /* Test of posix_spawn() function.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009 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
@@ -35,16 +35,6 @@
 
 extern char **environ;
 
-#ifndef STDIN_FILENO
-# define STDIN_FILENO 0
-#endif
-#ifndef STDOUT_FILENO
-# define STDOUT_FILENO 1
-#endif
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
-
 #define CHILD_PROGRAM_FILENAME "test-posix_spawn3"
 #define DATA_FILENAME "t!#$%&'()*+,-;=?@[\\]^_`{|}~.tmp"