From 8ecf1d24ee3fae764eaed003e615269787aeb8e3 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 11 Dec 2010 02:00:44 +0100 Subject: [PATCH] Rename module 'pipe' to 'spawn-pipe'. * modules/spawn-pipe: New file, renamed from modules/pipe. (Files, configure.ac, Makefile.am): Update. (Include): Mention "spawn-pipe.h" instead of "pipe.h". * modules/pipe: Reduce to an obsolete indirection to 'spawn-pipe'. * lib/spawn-pipe.h: New file, renamed from lib/pipe.h. * lib/spawn-pipe.c: New file, renamed from lib/pipe.c. Include "spawn-pipe.h" instead of "pipe.h". * m4/spawn-pipe.m4: New file, renamed from m4/pipe.m4. Rename gl_PIPE to gl_SPAWN_PIPE. * modules/spawn-pipe-tests: New file, renamed from modules/pipe-tests. (Files, Makefile.am): Update. * tests/test-spawn-pipe.sh: New file, renamed from tests/test-pipe.sh. Update. * tests/test-spawn-pipe.c: New file, renamed from tests/test-pipe.c. Include "spawn-pipe.h" instead of "pipe.h". * lib/csharpcomp.c: Include "spawn-pipe.h" instead of "pipe.h". * lib/javacomp.c: Likewise. * lib/javaversion.c: Likewise. * lib/pipe-filter-gi.c: Likewise. * lib/pipe-filter-ii.c: Likewise. * modules/csharpcomp (Depends-on): Add 'spawn-pipe', remove 'pipe'. * modules/javacomp (Depends-on): Likewise. * modules/javaversion (Depends-on): Likewise. * modules/pipe-filter-gi (Depends-on): Likewise. * modules/pipe-filter-ii (Depends-on): Likewise. * MODULES.html.sh (Executing programs): Update. * NEWS: Mention the change. --- ChangeLog | 31 +++++++++++++++++++ MODULES.html.sh | 2 +- NEWS | 3 ++ lib/csharpcomp.c | 2 +- lib/javacomp.c | 2 +- lib/javaversion.c | 2 +- lib/pipe-filter-gi.c | 2 +- lib/pipe-filter-ii.c | 2 +- lib/{pipe.c => spawn-pipe.c} | 2 +- lib/{pipe.h => spawn-pipe.h} | 6 ++-- m4/{pipe.m4 => spawn-pipe.m4} | 8 ++--- modules/csharpcomp | 2 +- modules/javacomp | 2 +- modules/javaversion | 2 +- modules/pipe | 41 +++++-------------------- modules/pipe-filter-gi | 2 +- modules/pipe-filter-ii | 2 +- modules/pipe-tests | 14 --------- modules/spawn-pipe | 51 ++++++++++++++++++++++++++++++++ modules/spawn-pipe-tests | 14 +++++++++ tests/test-pipe.sh | 8 ----- tests/{test-pipe.c => test-spawn-pipe.c} | 2 +- tests/test-spawn-pipe.sh | 8 +++++ 23 files changed, 135 insertions(+), 75 deletions(-) rename lib/{pipe.c => spawn-pipe.c} (99%) rename lib/{pipe.h => spawn-pipe.h} (98%) rename m4/{pipe.m4 => spawn-pipe.m4} (62%) delete mode 100644 modules/pipe-tests create mode 100644 modules/spawn-pipe create mode 100644 modules/spawn-pipe-tests delete mode 100755 tests/test-pipe.sh rename tests/{test-pipe.c => test-spawn-pipe.c} (99%) create mode 100755 tests/test-spawn-pipe.sh diff --git a/ChangeLog b/ChangeLog index 29849ba0d..137fc346d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,34 @@ +2010-12-10 Bruno Haible + + Rename module 'pipe' to 'spawn-pipe'. + * modules/spawn-pipe: New file, renamed from modules/pipe. + (Files, configure.ac, Makefile.am): Update. + (Include): Mention "spawn-pipe.h" instead of "pipe.h". + * modules/pipe: Reduce to an obsolete indirection to 'spawn-pipe'. + * lib/spawn-pipe.h: New file, renamed from lib/pipe.h. + * lib/spawn-pipe.c: New file, renamed from lib/pipe.c. Include + "spawn-pipe.h" instead of "pipe.h". + * m4/spawn-pipe.m4: New file, renamed from m4/pipe.m4. Rename gl_PIPE + to gl_SPAWN_PIPE. + * modules/spawn-pipe-tests: New file, renamed from modules/pipe-tests. + (Files, Makefile.am): Update. + * tests/test-spawn-pipe.sh: New file, renamed from tests/test-pipe.sh. + Update. + * tests/test-spawn-pipe.c: New file, renamed from tests/test-pipe.c. + Include "spawn-pipe.h" instead of "pipe.h". + * lib/csharpcomp.c: Include "spawn-pipe.h" instead of "pipe.h". + * lib/javacomp.c: Likewise. + * lib/javaversion.c: Likewise. + * lib/pipe-filter-gi.c: Likewise. + * lib/pipe-filter-ii.c: Likewise. + * modules/csharpcomp (Depends-on): Add 'spawn-pipe', remove 'pipe'. + * modules/javacomp (Depends-on): Likewise. + * modules/javaversion (Depends-on): Likewise. + * modules/pipe-filter-gi (Depends-on): Likewise. + * modules/pipe-filter-ii (Depends-on): Likewise. + * MODULES.html.sh (Executing programs): Update. + * NEWS: Mention the change. + 2010-12-10 Eric Blake pipe-posix: new module diff --git a/MODULES.html.sh b/MODULES.html.sh index 456497fad..aee5c24dc 100755 --- a/MODULES.html.sh +++ b/MODULES.html.sh @@ -3324,7 +3324,7 @@ func_all_modules () func_module findprog-lgpl func_module wait-process func_module execute - func_module pipe + func_module spawn-pipe func_module pipe-filter-gi func_module pipe-filter-ii func_module sh-quote diff --git a/NEWS b/NEWS index 76239ddb0..49a44ec95 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,9 @@ User visible incompatible changes Date Modules Changes +2010-12-10 pipe This module is renamed to spawn-pipe. The include + file is renamed to "spawn-pipe.h". + 2010-10-05 getdate This module is deprecated. Please use the new parse-datetime module for the replacement function parse_datetime(), or help us write diff --git a/lib/csharpcomp.c b/lib/csharpcomp.c index 8f791516a..b4d659040 100644 --- a/lib/csharpcomp.c +++ b/lib/csharpcomp.c @@ -27,7 +27,7 @@ #include #include "execute.h" -#include "pipe.h" +#include "spawn-pipe.h" #include "wait-process.h" #include "sh-quote.h" #include "safe-read.h" diff --git a/lib/javacomp.c b/lib/javacomp.c index 0bd5ec5d6..fc3365214 100644 --- a/lib/javacomp.c +++ b/lib/javacomp.c @@ -32,7 +32,7 @@ #include "javaversion.h" #include "execute.h" -#include "pipe.h" +#include "spawn-pipe.h" #include "wait-process.h" #include "classpath.h" #include "xsetenv.h" diff --git a/lib/javaversion.c b/lib/javaversion.c index 7d76539d1..b7fc4acf0 100644 --- a/lib/javaversion.c +++ b/lib/javaversion.c @@ -31,7 +31,7 @@ #endif #include "javaexec.h" -#include "pipe.h" +#include "spawn-pipe.h" #include "wait-process.h" #include "error.h" #include "gettext.h" diff --git a/lib/pipe-filter-gi.c b/lib/pipe-filter-gi.c index 19521836a..85a8d33c6 100644 --- a/lib/pipe-filter-gi.c +++ b/lib/pipe-filter-gi.c @@ -34,7 +34,7 @@ #endif #include "error.h" -#include "pipe.h" +#include "spawn-pipe.h" #include "wait-process.h" #include "xalloc.h" #include "gettext.h" diff --git a/lib/pipe-filter-ii.c b/lib/pipe-filter-ii.c index b25662d0e..93dfbc12f 100644 --- a/lib/pipe-filter-ii.c +++ b/lib/pipe-filter-ii.c @@ -33,7 +33,7 @@ #endif #include "error.h" -#include "pipe.h" +#include "spawn-pipe.h" #include "wait-process.h" #include "gettext.h" diff --git a/lib/pipe.c b/lib/spawn-pipe.c similarity index 99% rename from lib/pipe.c rename to lib/spawn-pipe.c index 1c81d1452..809cccf41 100644 --- a/lib/pipe.c +++ b/lib/spawn-pipe.c @@ -19,7 +19,7 @@ #include /* Specification. */ -#include "pipe.h" +#include "spawn-pipe.h" #include #include diff --git a/lib/pipe.h b/lib/spawn-pipe.h similarity index 98% rename from lib/pipe.h rename to lib/spawn-pipe.h index 7517892ba..449583dc4 100644 --- a/lib/pipe.h +++ b/lib/spawn-pipe.h @@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef _PIPE_H -#define _PIPE_H +#ifndef _SPAWN_PIPE_H +#define _SPAWN_PIPE_H /* Get pid_t. */ #include @@ -144,4 +144,4 @@ extern pid_t create_pipe_bidi (const char *progname, #endif -#endif /* _PIPE_H */ +#endif /* _SPAWN_PIPE_H */ diff --git a/m4/pipe.m4 b/m4/spawn-pipe.m4 similarity index 62% rename from m4/pipe.m4 rename to m4/spawn-pipe.m4 index 401881c8f..022c5a0f3 100644 --- a/m4/pipe.m4 +++ b/m4/spawn-pipe.m4 @@ -1,12 +1,12 @@ -# pipe.m4 serial 4 -dnl Copyright (C) 2004, 2008, 2009, 2010 Free Software Foundation, Inc. +# spawn-pipe.m4 serial 1 +dnl Copyright (C) 2004, 2008-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_PIPE], +AC_DEFUN([gl_SPAWN_PIPE], [ - dnl Prerequisites of lib/pipe.c. + dnl Prerequisites of lib/spawn-pipe.c. AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([AC_TYPE_MODE_T]) ]) diff --git a/modules/csharpcomp b/modules/csharpcomp index 3b3ee9089..853ad84ad 100644 --- a/modules/csharpcomp +++ b/modules/csharpcomp @@ -9,7 +9,7 @@ Depends-on: stdbool xmalloca execute -pipe +spawn-pipe wait-process getline sh-quote diff --git a/modules/javacomp b/modules/javacomp index 3bc33b81f..6cb6845f9 100644 --- a/modules/javacomp +++ b/modules/javacomp @@ -10,7 +10,7 @@ stdbool unistd javaversion execute -pipe +spawn-pipe wait-process classpath xsetenv diff --git a/modules/javaversion b/modules/javaversion index 8011077dd..bf1a47be3 100644 --- a/modules/javaversion +++ b/modules/javaversion @@ -10,7 +10,7 @@ lib/javaversion.class Depends-on: javaexec stdbool -pipe +spawn-pipe wait-process getline gettext-h diff --git a/modules/pipe b/modules/pipe index 922bda16c..3d6ccee52 100644 --- a/modules/pipe +++ b/modules/pipe @@ -1,48 +1,23 @@ Description: Creation of subprocesses, communicating via pipes. +Status: +obsolete + +Notice: +This module is obsolete. Use the module 'spawn-pipe' instead. + Files: -lib/pipe.h -lib/pipe.c -lib/w32spawn.h -m4/pipe.m4 Depends-on: -cloexec -dup2 -environ -error -exit -fatal-signal -gettext-h -open -pipe2 -pipe2-safer -spawn -posix_spawnp -posix_spawn_file_actions_init -posix_spawn_file_actions_addclose -posix_spawn_file_actions_adddup2 -posix_spawn_file_actions_addopen -posix_spawn_file_actions_destroy -posix_spawnattr_init -posix_spawnattr_setsigmask -posix_spawnattr_setflags -posix_spawnattr_destroy -stdbool -strpbrk -unistd -unistd-safer -wait-process +spawn-pipe configure.ac: -gl_PIPE Makefile.am: -lib_SOURCES += pipe.h pipe.c w32spawn.h Include: -"pipe.h" +"spawn-pipe.h" License: GPL diff --git a/modules/pipe-filter-gi b/modules/pipe-filter-gi index 95ab27a6c..7122c1ad4 100644 --- a/modules/pipe-filter-gi +++ b/modules/pipe-filter-gi @@ -7,7 +7,7 @@ lib/pipe-filter-gi.c lib/pipe-filter-aux.h Depends-on: -pipe +spawn-pipe wait-process error exit diff --git a/modules/pipe-filter-ii b/modules/pipe-filter-ii index 6ae280199..f845a8f5a 100644 --- a/modules/pipe-filter-ii +++ b/modules/pipe-filter-ii @@ -7,7 +7,7 @@ lib/pipe-filter-ii.c lib/pipe-filter-aux.h Depends-on: -pipe +spawn-pipe wait-process error exit diff --git a/modules/pipe-tests b/modules/pipe-tests deleted file mode 100644 index b20ea687a..000000000 --- a/modules/pipe-tests +++ /dev/null @@ -1,14 +0,0 @@ -Files: -tests/test-pipe.sh -tests/test-pipe.c -tests/macros.h - -Depends-on: -progname - -configure.ac: - -Makefile.am: -TESTS += test-pipe.sh -check_PROGRAMS += test-pipe -test_pipe_LDADD = $(LDADD) @LIBINTL@ diff --git a/modules/spawn-pipe b/modules/spawn-pipe new file mode 100644 index 000000000..04441b1a4 --- /dev/null +++ b/modules/spawn-pipe @@ -0,0 +1,51 @@ +Description: +Creation of subprocesses, communicating via pipes. + +Files: +lib/spawn-pipe.h +lib/spawn-pipe.c +lib/w32spawn.h +m4/spawn-pipe.m4 + +Depends-on: +cloexec +dup2 +environ +error +exit +fatal-signal +gettext-h +open +pipe2 +pipe2-safer +spawn +posix_spawnp +posix_spawn_file_actions_init +posix_spawn_file_actions_addclose +posix_spawn_file_actions_adddup2 +posix_spawn_file_actions_addopen +posix_spawn_file_actions_destroy +posix_spawnattr_init +posix_spawnattr_setsigmask +posix_spawnattr_setflags +posix_spawnattr_destroy +stdbool +strpbrk +unistd +unistd-safer +wait-process + +configure.ac: +gl_SPAWN_PIPE + +Makefile.am: +lib_SOURCES += spawn-pipe.h spawn-pipe.c w32spawn.h + +Include: +"spawn-pipe.h" + +License: +GPL + +Maintainer: +Bruno Haible diff --git a/modules/spawn-pipe-tests b/modules/spawn-pipe-tests new file mode 100644 index 000000000..c55903358 --- /dev/null +++ b/modules/spawn-pipe-tests @@ -0,0 +1,14 @@ +Files: +tests/test-spawn-pipe.sh +tests/test-spawn-pipe.c +tests/macros.h + +Depends-on: +progname + +configure.ac: + +Makefile.am: +TESTS += test-spawn-pipe.sh +check_PROGRAMS += test-spawn-pipe +test_spawn_pipe_LDADD = $(LDADD) @LIBINTL@ diff --git a/tests/test-pipe.sh b/tests/test-pipe.sh deleted file mode 100755 index 323c90fb9..000000000 --- a/tests/test-pipe.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -st=0 -for i in 0 1 2 3 4 5 6 7 ; do - ./test-pipe${EXEEXT} $i \ - || { echo test-pipe.sh: iteration $i failed >&2; st=1; } -done -exit $st diff --git a/tests/test-pipe.c b/tests/test-spawn-pipe.c similarity index 99% rename from tests/test-pipe.c rename to tests/test-spawn-pipe.c index 2dcab58b2..1f606f006 100644 --- a/tests/test-pipe.c +++ b/tests/test-spawn-pipe.c @@ -17,7 +17,7 @@ #include -#include "pipe.h" +#include "spawn-pipe.h" #include "wait-process.h" #include diff --git a/tests/test-spawn-pipe.sh b/tests/test-spawn-pipe.sh new file mode 100755 index 000000000..2e4ea129e --- /dev/null +++ b/tests/test-spawn-pipe.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +st=0 +for i in 0 1 2 3 4 5 6 7 ; do + ./test-spawn-pipe${EXEEXT} $i \ + || { echo test-spawn-pipe.sh: iteration $i failed >&2; st=1; } +done +exit $st -- 2.11.0