Replace system() with posix_spawn() if available

Some platforms disallow system() due to its perceived insecurity.
Luckily, we can be just as insecure using the more palatable
posix_spawn() instead!

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba2dd53629e74beda3911fe329feba5ed24d9b11..3e1a934c8ed775a00f92c41268e14933747875d0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1460,6 +1460,7 @@ CHECK_FUNCTION_EXISTS_GLIBC(nl_langinfo HAVE_NL_LANGINFO)
 CHECK_FUNCTION_EXISTS_GLIBC(openat HAVE_OPENAT)
 CHECK_FUNCTION_EXISTS_GLIBC(pipe HAVE_PIPE)
 CHECK_FUNCTION_EXISTS_GLIBC(poll HAVE_POLL)
+CHECK_FUNCTION_EXISTS_GLIBC(posix_spawn HAVE_POSIX_SPAWN)
 CHECK_FUNCTION_EXISTS_GLIBC(posix_spawnp HAVE_POSIX_SPAWNP)
 CHECK_FUNCTION_EXISTS_GLIBC(readlink HAVE_READLINK)
 CHECK_FUNCTION_EXISTS_GLIBC(readpassphrase HAVE_READPASSPHRASE)

diff --git a/configure.ac b/configure.ac
index 2c6cc337059eb1301fec7085c668d7fb3626d676..604132cb32ff790bc95c7bb2a4a546e6487fd4a4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -833,7 +833,8 @@ AC_CHECK_FUNCS([issetugid])
 AC_CHECK_FUNCS([lchflags lchmod lchown link linkat localtime_r lstat lutimes])
 AC_CHECK_FUNCS([mbrtowc memmove memset])
 AC_CHECK_FUNCS([mkdir mkfifo mknod mkstemp])
-AC_CHECK_FUNCS([nl_langinfo openat pipe poll posix_spawnp readlink readlinkat])
+AC_CHECK_FUNCS([nl_langinfo openat pipe poll posix_spawn posix_spawnp])
+AC_CHECK_FUNCS([readlink readlinkat])
 AC_CHECK_FUNCS([readpassphrase])
 AC_CHECK_FUNCS([select setenv setlocale sigaction statfs statvfs])
 AC_CHECK_FUNCS([strchr strdup strerror strncpy_s strnlen strrchr symlink])

diff --git a/test_utils/test_main.c b/test_utils/test_main.c
index f4d443060d882f785ce048b881cf92835a8cc03e..f31678166ad043964a65747b2f77ea71d9b5c2d4 100644 (file)
--- a/test_utils/test_main.c
+++ b/test_utils/test_main.c
@@ -84,6 +84,18 @@
 #if HAVE_MEMBERSHIP_H
 #include <membership.h>
 #endif
+#if !defined(_WIN32) || defined(__CYGWIN__)
+# if HAVE_POSIX_SPAWN
+#  if HAVE_SYS_WAIT_H
+#   include <sys/wait.h>
+#  endif
+#  if HAVE_SPAWN_H
+#   include <spawn.h>
+#  endif
+extern char **environ;
+#  define USE_POSIX_SPAWN 1
+# endif
+#endif
 
 #ifndef nitems
 #define nitems(arr) (sizeof(arr) / sizeof((arr)[0]))
@@ -3009,15 +3021,28 @@ int
 systemf(const char *fmt, ...)
 {
        char buff[8192];
+#if USE_POSIX_SPAWN
+       char *argv[] = { "/bin/sh", "-c", buff, NULL };
+       pid_t pid;
+#endif
        va_list ap;
        int r;
 
        va_start(ap, fmt);
        vsnprintf(buff, sizeof(buff), fmt, ap);
+       va_end(ap);
        if (verbosity > VERBOSITY_FULL)
                logprintf("Cmd: %s\n", buff);
+#if USE_POSIX_SPAWN
+       if ((r = posix_spawn(&pid, *argv, NULL, NULL, argv, environ)) == 0) {
+               while (waitpid(pid, &r, 0) == -1) {
+                       if (errno != EINTR)
+                               return (-1);
+               }
+       }
+#else
        r = system(buff);
-       va_end(ap);
+#endif
        return (r);
 }