diff --git a/ChangeLog b/ChangeLog index 893f2900f5..f33ce8ce6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2024-12-27 Bruno Haible + + Rename module spawn to spawn-h. + * modules/spawn-h: Renamed from modules/spawn. + * modules/spawn-h-tests: Renamed from modules/spawn-tests. + * modules/spawn-h-c++-tests: Renamed from modules/spawn-c++-tests. + * tests/test-spawn-h.c: Renamed from tests/test-spawn.c. + * tests/test-spawn-h-c++.cc: Renamed from tests/test-spawn-c++.cc. + * doc/posix-headers/spawn.texi: Update. + * modules/* (Depends-on): Update. + * modules/spawn: New file. + 2024-12-27 Bruno Haible Rename module search to search-h. diff --git a/doc/posix-headers/spawn.texi b/doc/posix-headers/spawn.texi index ce729eddcc..819b2d8853 100644 --- a/doc/posix-headers/spawn.texi +++ b/doc/posix-headers/spawn.texi @@ -3,8 +3,8 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/spawn.h.html} -Gnulib module: spawn -@mindex spawn +Gnulib module: spawn-h +@mindex spawn-h Portability problems fixed by Gnulib: @itemize diff --git a/modules/execute b/modules/execute index 2b302deeda..3189477fba 100644 --- a/modules/execute +++ b/modules/execute @@ -18,7 +18,7 @@ free-posix msvc-nothrow gettext-h gnulib-i18n -spawn +spawn-h posix_spawn posix_spawnp posix_spawn_file_actions_init diff --git a/modules/posix_spawn b/modules/posix_spawn index 6ca7ab9331..29b57e639d 100644 --- a/modules/posix_spawn +++ b/modules/posix_spawn @@ -6,7 +6,7 @@ lib/spawn.c m4/posix_spawn.m4 Depends-on: -spawn +spawn-h posix_spawn-internal [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1] configure.ac: diff --git a/modules/posix_spawn-internal b/modules/posix_spawn-internal index b55e3fcfd0..7e80c6dc15 100644 --- a/modules/posix_spawn-internal +++ b/modules/posix_spawn-internal @@ -7,7 +7,7 @@ lib/spawn_int.h m4/posix_spawn.m4 Depends-on: -spawn +spawn-h alloca-opt dup2 errno-h diff --git a/modules/posix_spawn_file_actions_addchdir b/modules/posix_spawn_file_actions_addchdir index 8f02bb5f27..8106962c1c 100644 --- a/modules/posix_spawn_file_actions_addchdir +++ b/modules/posix_spawn_file_actions_addchdir @@ -8,7 +8,7 @@ lib/spawn_int.h m4/posix_spawn_faction_addchdir.m4 Depends-on: -spawn +spawn-h posix_spawn_file_actions_init [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = 1] configure.ac: diff --git a/modules/posix_spawn_file_actions_addclose b/modules/posix_spawn_file_actions_addclose index 53a3b232a6..e7ac43130b 100644 --- a/modules/posix_spawn_file_actions_addclose +++ b/modules/posix_spawn_file_actions_addclose @@ -8,7 +8,7 @@ lib/spawn_int.h m4/posix_spawn.m4 Depends-on: -spawn +spawn-h getdtablesize [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = 1] posix_spawn_file_actions_init [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = 1] diff --git a/modules/posix_spawn_file_actions_adddup2 b/modules/posix_spawn_file_actions_adddup2 index 367a751949..e040a30a6b 100644 --- a/modules/posix_spawn_file_actions_adddup2 +++ b/modules/posix_spawn_file_actions_adddup2 @@ -8,7 +8,7 @@ lib/spawn_int.h m4/posix_spawn.m4 Depends-on: -spawn +spawn-h getdtablesize [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = 1] posix_spawn_file_actions_init [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = 1] diff --git a/modules/posix_spawn_file_actions_addfchdir b/modules/posix_spawn_file_actions_addfchdir index 4f15fdf2df..a12a394326 100644 --- a/modules/posix_spawn_file_actions_addfchdir +++ b/modules/posix_spawn_file_actions_addfchdir @@ -8,7 +8,7 @@ lib/spawn_int.h m4/posix_spawn_faction_addfchdir.m4 Depends-on: -spawn +spawn-h posix_spawn_file_actions_init [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR = 1] configure.ac: diff --git a/modules/posix_spawn_file_actions_addopen b/modules/posix_spawn_file_actions_addopen index 18b547768a..1d60609b5d 100644 --- a/modules/posix_spawn_file_actions_addopen +++ b/modules/posix_spawn_file_actions_addopen @@ -8,7 +8,7 @@ lib/spawn_int.h m4/posix_spawn.m4 Depends-on: -spawn +spawn-h getdtablesize [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1] posix_spawn_file_actions_init [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1] diff --git a/modules/posix_spawn_file_actions_destroy b/modules/posix_spawn_file_actions_destroy index d0a3e42ffb..b5a60248c6 100644 --- a/modules/posix_spawn_file_actions_destroy +++ b/modules/posix_spawn_file_actions_destroy @@ -7,7 +7,7 @@ lib/spawn_faction_destroy.c m4/posix_spawn.m4 Depends-on: -spawn +spawn-h configure.ac: gl_POSIX_SPAWN diff --git a/modules/posix_spawn_file_actions_init b/modules/posix_spawn_file_actions_init index 1b9a87dc17..7afe8b3138 100644 --- a/modules/posix_spawn_file_actions_init +++ b/modules/posix_spawn_file_actions_init @@ -8,7 +8,7 @@ lib/spawn_int.h m4/posix_spawn.m4 Depends-on: -spawn +spawn-h configure.ac: gl_POSIX_SPAWN diff --git a/modules/posix_spawnattr_destroy b/modules/posix_spawnattr_destroy index 751981b1ca..423d70f34e 100644 --- a/modules/posix_spawnattr_destroy +++ b/modules/posix_spawnattr_destroy @@ -7,7 +7,7 @@ lib/spawnattr_destroy.c m4/posix_spawn.m4 Depends-on: -spawn +spawn-h configure.ac: gl_POSIX_SPAWN diff --git a/modules/posix_spawnattr_getflags b/modules/posix_spawnattr_getflags index 8cbbfcc1e2..d5f18a25c3 100644 --- a/modules/posix_spawnattr_getflags +++ b/modules/posix_spawnattr_getflags @@ -7,7 +7,7 @@ lib/spawnattr_getflags.c m4/posix_spawn.m4 Depends-on: -spawn +spawn-h configure.ac: gl_POSIX_SPAWN diff --git a/modules/posix_spawnattr_getpgroup b/modules/posix_spawnattr_getpgroup index 9738eec832..3a3d4e916e 100644 --- a/modules/posix_spawnattr_getpgroup +++ b/modules/posix_spawnattr_getpgroup @@ -7,7 +7,7 @@ lib/spawnattr_getpgroup.c m4/posix_spawn.m4 Depends-on: -spawn +spawn-h configure.ac: gl_POSIX_SPAWN diff --git a/modules/posix_spawnattr_getschedparam b/modules/posix_spawnattr_getschedparam index 3a2ba00a1d..b40ed87e5c 100644 --- a/modules/posix_spawnattr_getschedparam +++ b/modules/posix_spawnattr_getschedparam @@ -7,7 +7,7 @@ lib/spawnattr_getschedparam.c m4/posix_spawn.m4 Depends-on: -spawn +spawn-h configure.ac: gl_POSIX_SPAWN diff --git a/modules/posix_spawnattr_getschedpolicy b/modules/posix_spawnattr_getschedpolicy index a09fe7eb76..ec7bd8bb4d 100644 --- a/modules/posix_spawnattr_getschedpolicy +++ b/modules/posix_spawnattr_getschedpolicy @@ -7,7 +7,7 @@ lib/spawnattr_getschedpolicy.c m4/posix_spawn.m4 Depends-on: -spawn +spawn-h configure.ac: gl_POSIX_SPAWN diff --git a/modules/posix_spawnattr_getsigdefault b/modules/posix_spawnattr_getsigdefault index a9672e241c..f2647a9b91 100644 --- a/modules/posix_spawnattr_getsigdefault +++ b/modules/posix_spawnattr_getsigdefault @@ -7,7 +7,7 @@ lib/spawnattr_getdefault.c m4/posix_spawn.m4 Depends-on: -spawn +spawn-h configure.ac: gl_POSIX_SPAWN diff --git a/modules/posix_spawnattr_getsigmask b/modules/posix_spawnattr_getsigmask index 608127f299..b7ac254b5a 100644 --- a/modules/posix_spawnattr_getsigmask +++ b/modules/posix_spawnattr_getsigmask @@ -7,7 +7,7 @@ lib/spawnattr_getsigmask.c m4/posix_spawn.m4 Depends-on: -spawn +spawn-h configure.ac: gl_POSIX_SPAWN diff --git a/modules/posix_spawnattr_init b/modules/posix_spawnattr_init index d564b73e59..24473d448b 100644 --- a/modules/posix_spawnattr_init +++ b/modules/posix_spawnattr_init @@ -7,7 +7,7 @@ lib/spawnattr_init.c m4/posix_spawn.m4 Depends-on: -spawn +spawn-h configure.ac: gl_POSIX_SPAWN diff --git a/modules/posix_spawnattr_setflags b/modules/posix_spawnattr_setflags index 9b01359061..0875319f73 100644 --- a/modules/posix_spawnattr_setflags +++ b/modules/posix_spawnattr_setflags @@ -7,7 +7,7 @@ lib/spawnattr_setflags.c m4/posix_spawn.m4 Depends-on: -spawn +spawn-h configure.ac: gl_POSIX_SPAWN diff --git a/modules/posix_spawnattr_setpgroup b/modules/posix_spawnattr_setpgroup index 70f78684c1..0b5d030d4a 100644 --- a/modules/posix_spawnattr_setpgroup +++ b/modules/posix_spawnattr_setpgroup @@ -6,7 +6,7 @@ lib/spawnattr_setpgroup.c m4/posix_spawn.m4 Depends-on: -spawn +spawn-h configure.ac: gl_POSIX_SPAWN diff --git a/modules/posix_spawnattr_setschedparam b/modules/posix_spawnattr_setschedparam index 3bb0ff7248..94e3a45f8f 100644 --- a/modules/posix_spawnattr_setschedparam +++ b/modules/posix_spawnattr_setschedparam @@ -7,7 +7,7 @@ lib/spawnattr_setschedparam.c m4/posix_spawn.m4 Depends-on: -spawn +spawn-h configure.ac: gl_POSIX_SPAWN diff --git a/modules/posix_spawnattr_setschedpolicy b/modules/posix_spawnattr_setschedpolicy index d6944e2344..c0c04d7d56 100644 --- a/modules/posix_spawnattr_setschedpolicy +++ b/modules/posix_spawnattr_setschedpolicy @@ -7,7 +7,7 @@ lib/spawnattr_setschedpolicy.c m4/posix_spawn.m4 Depends-on: -spawn +spawn-h configure.ac: gl_POSIX_SPAWN diff --git a/modules/posix_spawnattr_setsigdefault b/modules/posix_spawnattr_setsigdefault index e6aa9dd37c..521dce65a3 100644 --- a/modules/posix_spawnattr_setsigdefault +++ b/modules/posix_spawnattr_setsigdefault @@ -7,7 +7,7 @@ lib/spawnattr_setdefault.c m4/posix_spawn.m4 Depends-on: -spawn +spawn-h configure.ac: gl_POSIX_SPAWN diff --git a/modules/posix_spawnattr_setsigmask b/modules/posix_spawnattr_setsigmask index 2f0b3f4a30..9f06eb71a8 100644 --- a/modules/posix_spawnattr_setsigmask +++ b/modules/posix_spawnattr_setsigmask @@ -7,7 +7,7 @@ lib/spawnattr_setsigmask.c m4/posix_spawn.m4 Depends-on: -spawn +spawn-h configure.ac: gl_POSIX_SPAWN diff --git a/modules/posix_spawnp b/modules/posix_spawnp index 3cd0721287..d53b860c5c 100644 --- a/modules/posix_spawnp +++ b/modules/posix_spawnp @@ -6,7 +6,7 @@ lib/spawnp.c m4/posix_spawn.m4 Depends-on: -spawn +spawn-h posix_spawn-internal [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1] configure.ac: diff --git a/modules/posixcheck b/modules/posixcheck index dfb047929a..48791e5679 100644 --- a/modules/posixcheck +++ b/modules/posixcheck @@ -27,7 +27,7 @@ pty-h sched-h search-h signal-h -spawn +spawn-h stdio stdlib string diff --git a/modules/spawn b/modules/spawn index e096e11a23..8f6ac9398d 100644 --- a/modules/spawn +++ b/modules/spawn @@ -1,79 +1,20 @@ Description: A POSIX compliant . +Status: +deprecated + +Notice: +This module is deprecated. Use the module 'spawn-h' instead. + Files: -lib/spawn.in.h -m4/spawn_h.m4 -m4/pid_t.m4 Depends-on: -gen-header -include_next -sched-h -signal-h -snippet/arg-nonnull -snippet/c++defs -snippet/warn-on-use +spawn-h configure.ac: -gl_SPAWN_H -gl_SPAWN_H_REQUIRE_DEFAULTS -AC_PROG_MKDIR_P Makefile.am: -BUILT_SOURCES += spawn.h - -# We need the following in order to create a replacement for when -# the system doesn't have one. -spawn.h: spawn.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ - -e 's|@''HAVE_SPAWN_H''@|$(HAVE_SPAWN_H)|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SPAWN_H''@|$(NEXT_SPAWN_H)|g' \ - -e 's/@''GNULIB_POSIX_SPAWN''@/$(GNULIB_POSIX_SPAWN)/g' \ - -e 's/@''GNULIB_POSIX_SPAWNP''@/$(GNULIB_POSIX_SPAWNP)/g' \ - -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT)/g' \ - -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)/g' \ - -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)/g' \ - -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)/g' \ - -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR)/g' \ - -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)/g' \ - -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY)/g' \ - -e 's/@''GNULIB_POSIX_SPAWNATTR_INIT''@/$(GNULIB_POSIX_SPAWNATTR_INIT)/g' \ - -e 's/@''GNULIB_POSIX_SPAWNATTR_GETFLAGS''@/$(GNULIB_POSIX_SPAWNATTR_GETFLAGS)/g' \ - -e 's/@''GNULIB_POSIX_SPAWNATTR_SETFLAGS''@/$(GNULIB_POSIX_SPAWNATTR_SETFLAGS)/g' \ - -e 's/@''GNULIB_POSIX_SPAWNATTR_GETPGROUP''@/$(GNULIB_POSIX_SPAWNATTR_GETPGROUP)/g' \ - -e 's/@''GNULIB_POSIX_SPAWNATTR_SETPGROUP''@/$(GNULIB_POSIX_SPAWNATTR_SETPGROUP)/g' \ - -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM''@/$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM)/g' \ - -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM''@/$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM)/g' \ - -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY''@/$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY)/g' \ - -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY''@/$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY)/g' \ - -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT''@/$(GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT)/g' \ - -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT''@/$(GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT)/g' \ - -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSIGMASK''@/$(GNULIB_POSIX_SPAWNATTR_GETSIGMASK)/g' \ - -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSIGMASK''@/$(GNULIB_POSIX_SPAWNATTR_SETSIGMASK)/g' \ - -e 's/@''GNULIB_POSIX_SPAWNATTR_DESTROY''@/$(GNULIB_POSIX_SPAWNATTR_DESTROY)/g' \ - -e 's|@''HAVE_POSIX_SPAWN''@|$(HAVE_POSIX_SPAWN)|g' \ - -e 's|@''HAVE_POSIX_SPAWNATTR_T''@|$(HAVE_POSIX_SPAWNATTR_T)|g' \ - -e 's|@''HAVE_POSIX_SPAWN_FILE_ACTIONS_T''@|$(HAVE_POSIX_SPAWN_FILE_ACTIONS_T)|g' \ - -e 's|@''HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR''@|$(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)|g' \ - -e 's|@''HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR''@|$(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR)|g' \ - -e 's|@''REPLACE_POSIX_SPAWN''@|$(REPLACE_POSIX_SPAWN)|g' \ - -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)|g' \ - -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)|g' \ - -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)|g' \ - -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR)|g' \ - -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - $(srcdir)/spawn.in.h > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += spawn.h spawn.h-t Include: @@ -82,4 +23,3 @@ License: LGPLv2+ Maintainer: -glibc diff --git a/modules/spawn-c++-tests b/modules/spawn-c++-tests deleted file mode 100644 index 1ee64043bb..0000000000 --- a/modules/spawn-c++-tests +++ /dev/null @@ -1,19 +0,0 @@ -Files: -tests/test-spawn-c++.cc -tests/signature.h - -Status: -c++-test - -Depends-on: -ansi-c++-opt - -configure.ac: - -Makefile.am: -if ANSICXX -TESTS += test-spawn-c++ -check_PROGRAMS += test-spawn-c++ -test_spawn_c___SOURCES = test-spawn-c++.cc -test_spawn_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB) -endif diff --git a/modules/spawn-h b/modules/spawn-h new file mode 100644 index 0000000000..e096e11a23 --- /dev/null +++ b/modules/spawn-h @@ -0,0 +1,85 @@ +Description: +A POSIX compliant . + +Files: +lib/spawn.in.h +m4/spawn_h.m4 +m4/pid_t.m4 + +Depends-on: +gen-header +include_next +sched-h +signal-h +snippet/arg-nonnull +snippet/c++defs +snippet/warn-on-use + +configure.ac: +gl_SPAWN_H +gl_SPAWN_H_REQUIRE_DEFAULTS +AC_PROG_MKDIR_P + +Makefile.am: +BUILT_SOURCES += spawn.h + +# We need the following in order to create a replacement for when +# the system doesn't have one. +spawn.h: spawn.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ + -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ + -e 's|@''HAVE_SPAWN_H''@|$(HAVE_SPAWN_H)|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SPAWN_H''@|$(NEXT_SPAWN_H)|g' \ + -e 's/@''GNULIB_POSIX_SPAWN''@/$(GNULIB_POSIX_SPAWN)/g' \ + -e 's/@''GNULIB_POSIX_SPAWNP''@/$(GNULIB_POSIX_SPAWNP)/g' \ + -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT)/g' \ + -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)/g' \ + -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)/g' \ + -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)/g' \ + -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR)/g' \ + -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)/g' \ + -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY)/g' \ + -e 's/@''GNULIB_POSIX_SPAWNATTR_INIT''@/$(GNULIB_POSIX_SPAWNATTR_INIT)/g' \ + -e 's/@''GNULIB_POSIX_SPAWNATTR_GETFLAGS''@/$(GNULIB_POSIX_SPAWNATTR_GETFLAGS)/g' \ + -e 's/@''GNULIB_POSIX_SPAWNATTR_SETFLAGS''@/$(GNULIB_POSIX_SPAWNATTR_SETFLAGS)/g' \ + -e 's/@''GNULIB_POSIX_SPAWNATTR_GETPGROUP''@/$(GNULIB_POSIX_SPAWNATTR_GETPGROUP)/g' \ + -e 's/@''GNULIB_POSIX_SPAWNATTR_SETPGROUP''@/$(GNULIB_POSIX_SPAWNATTR_SETPGROUP)/g' \ + -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM''@/$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM)/g' \ + -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM''@/$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM)/g' \ + -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY''@/$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY)/g' \ + -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY''@/$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY)/g' \ + -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT''@/$(GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT)/g' \ + -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT''@/$(GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT)/g' \ + -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSIGMASK''@/$(GNULIB_POSIX_SPAWNATTR_GETSIGMASK)/g' \ + -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSIGMASK''@/$(GNULIB_POSIX_SPAWNATTR_SETSIGMASK)/g' \ + -e 's/@''GNULIB_POSIX_SPAWNATTR_DESTROY''@/$(GNULIB_POSIX_SPAWNATTR_DESTROY)/g' \ + -e 's|@''HAVE_POSIX_SPAWN''@|$(HAVE_POSIX_SPAWN)|g' \ + -e 's|@''HAVE_POSIX_SPAWNATTR_T''@|$(HAVE_POSIX_SPAWNATTR_T)|g' \ + -e 's|@''HAVE_POSIX_SPAWN_FILE_ACTIONS_T''@|$(HAVE_POSIX_SPAWN_FILE_ACTIONS_T)|g' \ + -e 's|@''HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR''@|$(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)|g' \ + -e 's|@''HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR''@|$(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR)|g' \ + -e 's|@''REPLACE_POSIX_SPAWN''@|$(REPLACE_POSIX_SPAWN)|g' \ + -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)|g' \ + -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)|g' \ + -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)|g' \ + -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR)|g' \ + -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + $(srcdir)/spawn.in.h > $@-t + $(AM_V_at)mv $@-t $@ +MOSTLYCLEANFILES += spawn.h spawn.h-t + +Include: + + +License: +LGPLv2+ + +Maintainer: +glibc diff --git a/modules/spawn-h-c++-tests b/modules/spawn-h-c++-tests new file mode 100644 index 0000000000..09496a8c01 --- /dev/null +++ b/modules/spawn-h-c++-tests @@ -0,0 +1,19 @@ +Files: +tests/test-spawn-h-c++.cc +tests/signature.h + +Status: +c++-test + +Depends-on: +ansi-c++-opt + +configure.ac: + +Makefile.am: +if ANSICXX +TESTS += test-spawn-h-c++ +check_PROGRAMS += test-spawn-h-c++ +test_spawn_h_c___SOURCES = test-spawn-h-c++.cc +test_spawn_h_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB) +endif diff --git a/modules/spawn-h-tests b/modules/spawn-h-tests new file mode 100644 index 0000000000..e7519480ea --- /dev/null +++ b/modules/spawn-h-tests @@ -0,0 +1,11 @@ +Files: +tests/test-spawn-h.c + +Depends-on: +spawn-h-c++-tests + +configure.ac: + +Makefile.am: +TESTS += test-spawn-h +check_PROGRAMS += test-spawn-h diff --git a/modules/spawn-pipe b/modules/spawn-pipe index fc10461128..a1693d930b 100644 --- a/modules/spawn-pipe +++ b/modules/spawn-pipe @@ -23,7 +23,7 @@ msvc-nothrow open pipe2 pipe2-safer -spawn +spawn-h posix_spawn posix_spawnp posix_spawn_file_actions_init diff --git a/modules/spawn-tests b/modules/spawn-tests deleted file mode 100644 index 056b2d87ef..0000000000 --- a/modules/spawn-tests +++ /dev/null @@ -1,11 +0,0 @@ -Files: -tests/test-spawn.c - -Depends-on: -spawn-c++-tests - -configure.ac: - -Makefile.am: -TESTS += test-spawn -check_PROGRAMS += test-spawn diff --git a/tests/test-spawn-c++.cc b/tests/test-spawn-h-c++.cc similarity index 100% rename from tests/test-spawn-c++.cc rename to tests/test-spawn-h-c++.cc diff --git a/tests/test-spawn.c b/tests/test-spawn-h.c similarity index 100% rename from tests/test-spawn.c rename to tests/test-spawn-h.c