pipe-posix: Make it work in C++ mode.

* lib/unistd.in.h: Don't include <io.h>, <fcntl.h> for pipe.
(pipe): Use common idiom, not a macro definition.
* lib/pipe.c: New file.
* m4/pipe.m4: New file.
* modules/pipe-posix (Description): Enhance.
(Files): Add lib/pipe.c, m4/pipe.m4.
(configure.ac): Invoke gl_FUNC_PIPE.
* m4/unistd_h.m4 (gl_UNISTD_H_DEFAULTS): Initialize HAVE_PIPE.
* modules/unistd (Makefile.am): Substitute HAVE_PIPE.
* tests/test-unistd-c++.cc: Check the signature of pipe.

diff --git a/ChangeLog b/ChangeLog
index 137fc346d1b3d9722d90da4fc5b3e01d8dea8d06..95dceb2e4973bbf42f28eb104fc825d65f21cae7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-10  Bruno Haible  <bruno@clisp.org>
+
+       pipe-posix: Make it work in C++ mode.
+       * lib/unistd.in.h: Don't include <io.h>, <fcntl.h> for pipe.
+       (pipe): Use common idiom, not a macro definition.
+       * lib/pipe.c: New file.
+       * m4/pipe.m4: New file.
+       * modules/pipe-posix (Description): Enhance.
+       (Files): Add lib/pipe.c, m4/pipe.m4.
+       (configure.ac): Invoke gl_FUNC_PIPE.
+       * m4/unistd_h.m4 (gl_UNISTD_H_DEFAULTS): Initialize HAVE_PIPE.
+       * modules/unistd (Makefile.am): Substitute HAVE_PIPE.
+       * tests/test-unistd-c++.cc: Check the signature of pipe.
+
 2010-12-10  Bruno Haible  <bruno@clisp.org>
 
        Rename module 'pipe' to 'spawn-pipe'.

diff --git a/lib/pipe.c b/lib/pipe.c
new file mode 100644 (file)
index 0000000..e002ad2
--- /dev/null
+++ b/lib/pipe.c
@@ -0,0 +1,42 @@
+/* Create a pipe.
+   Copyright (C) 2009-2010 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <unistd.h>
+
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+/* Native Woe32 API.  */
+
+/* Get _pipe().  */
+# include <io.h>
+
+/* Get _O_BINARY.  */
+# include <fcntl.h>
+
+int
+pipe (int fd[2])
+{
+  return _pipe (fd, 4096, _O_BINARY);
+}
+
+#else
+
+# error "This platform lacks a pipe function, and Gnulib doesn't provide a replacement. This is a bug in Gnulib."
+
+#endif

diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index 571afa1ba9871110f7dc6be0ba97550429e4c760..6bd326459d541c1890f0398145caf48a1093bd49 100644 (file)
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -82,14 +82,10 @@
 # include <stdlib.h>
 #endif
 
-/* mingw declares getcwd in <io.h>, not in <unistd.h>.  It also provides
-   _pipe in <io.h>, but that requires _O_BINARY from <fcntl.h>.  */
-#if ((@GNULIB_GETCWD@ || @GNULIB_PIPE@ || defined GNULIB_POSIXCHECK) \
+/* mingw declares getcwd in <io.h>, not in <unistd.h>.  */
+#if ((@GNULIB_GETCWD@ || defined GNULIB_POSIXCHECK) \
      && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
 # include <io.h>
-# if @GNULIB_PIPE@
-#  include <fcntl.h>
-# endif
 #endif
 
 /* AIX and OSF/1 5.1 declare getdomainname in <netdb.h>, not in <unistd.h>.  */
@@ -980,14 +976,22 @@ _GL_WARN_ON_USE (lseek, "lseek does not fail with ESPIPE on pipes on some "
 /* Create a pipe, defaulting to O_BINARY mode.
    Store the read-end as fd[0] and the write-end as fd[1].
    Return 0 upon success, or -1 with errno set upon failure.  */
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-#  define pipe(fd) _pipe (fd, 4096, _O_BINARY)
+# if @HAVE_PIPE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define pipe rpl_pipe
+#  endif
+_GL_FUNCDECL_RPL (pipe, int, (int fd[2]) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pipe, int, (int fd[2]));
+# else
+_GL_FUNCDECL_SYS (pipe, int, (int fd[2]) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_SYS (pipe, int, (int fd[2]));
 # endif
+_GL_CXXALIASWARN (pipe);
 #elif defined GNULIB_POSIXCHECK
 # undef pipe
 # if HAVE_RAW_DECL_PIPE
 _GL_WARN_ON_USE (pipe, "pipe is unportable - "
-                 "use gnulib module pipe for portability");
+                 "use gnulib module pipe-posix for portability");
 # endif
 #endif
 

diff --git a/m4/pipe.m4 b/m4/pipe.m4
new file mode 100644 (file)
index 0000000..352c2a2
--- /dev/null
+++ b/m4/pipe.m4
@@ -0,0 +1,16 @@
+# pipe.m4 serial 1
+dnl Copyright (C) 2010 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_FUNC_PIPE],
+[
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+
+  AC_CHECK_FUNCS_ONCE([pipe])
+  if test $ac_cv_func_pipe != yes; then
+    HAVE_PIPE=0
+    AC_LIBOBJ([pipe])
+  fi
+])

diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4
index 069095185d5723aa77d9161e33b5674a82e3bada..31c7d00ccec817f4390265ae98988412d1ee4cad 100644 (file)
--- a/m4/unistd_h.m4
+++ b/m4/unistd_h.m4
@@ -1,4 +1,4 @@
-# unistd_h.m4 serial 48
+# unistd_h.m4 serial 49
 dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -113,6 +113,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   HAVE_LCHOWN=1;          AC_SUBST([HAVE_LCHOWN])
   HAVE_LINK=1;            AC_SUBST([HAVE_LINK])
   HAVE_LINKAT=1;          AC_SUBST([HAVE_LINKAT])
+  HAVE_PIPE=1;            AC_SUBST([HAVE_PIPE])
   HAVE_PIPE2=1;           AC_SUBST([HAVE_PIPE2])
   HAVE_PREAD=1;           AC_SUBST([HAVE_PREAD])
   HAVE_PWRITE=1;          AC_SUBST([HAVE_PWRITE])

diff --git a/modules/pipe-posix b/modules/pipe-posix
index 9f753db85a7c11d64e445842ab2bd9cbd1f7906b..e29f92da7acd17c9019e4bfb3cc7d08f52897c03 100644 (file)
--- a/modules/pipe-posix
+++ b/modules/pipe-posix
@@ -1,13 +1,15 @@
 Description:
-Creation of a pipe.
+pipe() function: Creation of a pipe.
 
 Files:
+lib/pipe.c
+m4/pipe.m4
 
 Depends-on:
 unistd
 
 configure.ac:
-AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+gl_FUNC_PIPE
 gl_UNISTD_MODULE_INDICATOR([pipe])
 
 Makefile.am:

diff --git a/modules/unistd b/modules/unistd
index e2475dd105bde7c7b1aac048c3aa52938b3989dc..bf94df9b74876a26e4a42534579f1b5753a35b21 100644 (file)
--- a/modules/unistd
+++ b/modules/unistd
@@ -87,6 +87,7 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
              -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \
              -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
              -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \
+             -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \
              -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \
              -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \
              -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \

diff --git a/tests/test-unistd-c++.cc b/tests/test-unistd-c++.cc
index 2769d045879a8b6b12da170d52f37e8851e394e8..7af68b110b6f94cd755b9d4c592ebe821d727f4b 100644 (file)
--- a/tests/test-unistd-c++.cc
+++ b/tests/test-unistd-c++.cc
@@ -129,6 +129,10 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::linkat, int,
 SIGNATURE_CHECK (GNULIB_NAMESPACE::lseek, off_t, (int, off_t, int));
 #endif
 
+#if GNULIB_TEST_PIPE
+SIGNATURE_CHECK (GNULIB_NAMESPACE::pipe, int, (int[2]));
+#endif
+
 #if GNULIB_TEST_PIPE2
 SIGNATURE_CHECK (GNULIB_NAMESPACE::pipe2, int, (int[2], int));
 #endif