From 98e91bd2c61748ce20b8e2a0b6d689ada75237c4 Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 12 Jan 2010 01:11:42 +0000
Subject: [PATCH]

---
 config/config.h.in     | 3 +++
 configure              | 2 +-
 configure.ac           | 2 +-
 magick/magick-config.h | 3 +++
 magick/nt-base.h       | 3 +++
 magick/utility.c       | 9 +++++++--
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/config/config.h.in b/config/config.h.in
index e8ae0c6e4..9b882d49d 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -348,6 +348,9 @@
 /* Define if libtool can extract symbol lists from object files. */
 #undef HAVE_PRELOADED_SYMBOLS
 
+/* Define to 1 if you have the <process.h> header file. */
+#undef HAVE_PROCESS_H
+
 /* Define if you have POSIX threads libraries and header files. */
 #undef HAVE_PTHREAD
 
diff --git a/configure b/configure
index 023c032db..84bb38fad 100755
--- a/configure
+++ b/configure
@@ -19316,7 +19316,7 @@ fi
 
 
 # Check additional headers
-for ac_header in arm/limits.h complex.h errno.h fcntl.h inttypes.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h OS.h stdarg.h stddef.h string.h strings.h sys/ipc.h sys/resource.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/types.h sys/wait.h unistd.h wchar.h
+for ac_header in arm/limits.h complex.h errno.h fcntl.h inttypes.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h OS.h process.h stdarg.h stddef.h string.h strings.h sys/ipc.h sys/resource.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/types.h sys/wait.h unistd.h wchar.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
diff --git a/configure.ac b/configure.ac
index 1f6c3d492..98b5d5526 100755
--- a/configure.ac
+++ b/configure.ac
@@ -763,7 +763,7 @@ fi
 AC_HEADER_DIRENT
 
 # Check additional headers
-AC_CHECK_HEADERS(arm/limits.h complex.h errno.h fcntl.h inttypes.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h OS.h stdarg.h stddef.h string.h strings.h sys/ipc.h sys/resource.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/types.h sys/wait.h unistd.h wchar.h)
+AC_CHECK_HEADERS(arm/limits.h complex.h errno.h fcntl.h inttypes.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h OS.h process.h stdarg.h stddef.h string.h strings.h sys/ipc.h sys/resource.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/types.h sys/wait.h unistd.h wchar.h)
 
 ########
 #
diff --git a/magick/magick-config.h b/magick/magick-config.h
index 870b5019f..a1de28a5a 100644
--- a/magick/magick-config.h
+++ b/magick/magick-config.h
@@ -521,6 +521,9 @@
 #define MAGICKCORE_HAVE_PRELOADED_SYMBOLS  1 
 #endif
 
+/* Define to 1 if you have the <process.h> header file. */
+/* #undef HAVE_PROCESS_H */
+
 /* Define if you have POSIX threads libraries and header files. */
 #ifndef MAGICKCORE_HAVE_PTHREAD 
 #define MAGICKCORE_HAVE_PTHREAD  1 
diff --git a/magick/nt-base.h b/magick/nt-base.h
index 389241632..0073a0b72 100644
--- a/magick/nt-base.h
+++ b/magick/nt-base.h
@@ -187,6 +187,9 @@ extern "C" {
 #if !defined(setmode)
 #  define setmode  _setmode
 #endif
+#if !defined(spawnvp)
+#  define spawnvp  _spawnvp
+#endif
 #if !defined(stat) && !defined(__BORLANDC__)
 #if defined(__WINDOWS__) && !defined(Windows95) && \
   !(defined(_MSC_VER) && (_MSC_VER < 1400)) &&  (__MSVCRT_VERSION__ < 0x800)
diff --git a/magick/utility.c b/magick/utility.c
index c8963cdb1..79af15260 100644
--- a/magick/utility.c
+++ b/magick/utility.c
@@ -58,6 +58,9 @@
 #include "magick/string_.h"
 #include "magick/token.h"
 #include "magick/utility.h"
+#if defined(MAGICKCORE_HAVE_PROCESS_H)
+#include <process.h>
+#endif
 #if defined(MAGICKCORE_HAVE_MACH_O_DYLD_H)
 #include <mach-o/dyld.h>
 #endif
@@ -1901,7 +1904,9 @@ MagickExport int SystemCommand(const MagickBooleanType verbose,
       (void) fflush(stderr);
     }
 #if defined(MAGICKCORE_POSIX_SUPPORT)
-#if !defined(MAGICKCORE_HAVE_EXECVP)
+#if defined(MAGICKCORE_HAVE_SPAWNVP)
+  status=spawnvp(_P_WAIT,arguments[1],arguments+1);
+#elif !defined(MAGICKCORE_HAVE_EXECVP)
   status=system(command);
 #else
   if (strspn(command,"&;<>|") == 0)
@@ -1947,7 +1952,7 @@ MagickExport int SystemCommand(const MagickBooleanType verbose,
     }
 #endif
 #elif defined(__WINDOWS__)
-  status=NTSystemCommand(command);
+  status=spawnvp(_P_WAIT,arguments[1],arguments+1);
 #elif defined(macintosh)
   status=MACSystemCommand(command);
 #elif defined(vms)
-- 
2.40.0