/* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2003, 2004, 2009,
- * 2010, 2012 Free Software Foundation, Inc.
+ * 2010, 2012, 2013, 2014 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
#ifdef HAVE_STRING_H
#include <string.h>
#endif
-#ifdef HAVE_UNISTD_H
#include <unistd.h>
-#endif
#if HAVE_SYS_WAIT_H
# include <sys/wait.h>
#endif
+#ifdef __MINGW32__
+# include <process.h> /* for spawnvp and friends */
+#endif
+
#include "posix.h"
\f
#ifdef HAVE_SYSTEM
-#ifdef HAVE_WAITPID
-
SCM_DEFINE (scm_system_star, "system*", 0, 0, 1,
(SCM args),
if (scm_is_pair (args))
{
SCM oldint;
- SCM oldquit;
SCM sig_ign;
SCM sigint;
+ /* SIGQUIT is undefined on MS-Windows. */
+#ifdef SIGQUIT
+ SCM oldquit;
SCM sigquit;
+#endif
+#ifdef HAVE_FORK
int pid;
+#else
+ int status;
+#endif
char **execargv;
/* allocate before fork */
/* make sure the child can't kill us (as per normal system call) */
sig_ign = scm_from_ulong ((unsigned long) SIG_IGN);
sigint = scm_from_int (SIGINT);
- sigquit = scm_from_int (SIGQUIT);
oldint = scm_sigaction (sigint, sig_ign, SCM_UNDEFINED);
+#ifdef SIGQUIT
+ sigquit = scm_from_int (SIGQUIT);
oldquit = scm_sigaction (sigquit, sig_ign, SCM_UNDEFINED);
-
+#endif
+
+#ifdef HAVE_FORK
pid = fork ();
if (pid == 0)
{
return scm_from_int (status);
}
+#else /* !HAVE_FORK */
+ status = spawnvp (P_WAIT, execargv[0], (const char * const *)execargv);
+ scm_sigaction (sigint, SCM_CAR (oldint), SCM_CDR (oldint));
+#ifdef SIGQUIT
+ scm_sigaction (sigquit, SCM_CAR (oldquit), SCM_CDR (oldquit));
+#endif
+
+ return scm_from_int (status);
+#endif /* !HAVE_FORK */
}
else
SCM_WRONG_TYPE_ARG (1, args);
}
#undef FUNC_NAME
-#endif /* HAVE_WAITPID */
#endif /* HAVE_SYSTEM */
}
#undef FUNC_NAME
+/* Get an integer from an environment variable. */
+int
+scm_getenv_int (const char *var, int def)
+{
+ char *end = 0;
+ char *val = getenv (var);
+ long res = def;
+ if (!val)
+ return def;
+ res = strtol (val, &end, 10);
+ if (end == val)
+ return def;
+ return res;
+}
+
/* simple exit, without unwinding the scheme stack or flushing ports. */
SCM_DEFINE (scm_primitive_exit, "primitive-exit", 0, 1, 0,
(SCM status),