32-way branching in intmap.scm, not 16-way

[bpt/guile.git] / libguile / simpos.c

diff --git a/libguile/simpos.c b/libguile/simpos.c
index 41af233..7005828 100644 (file)
--- a/libguile/simpos.c
+++ b/libguile/simpos.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2003, 2004, 2009 Free Software
- * Foundation, Inc.
- * 
+/* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2003, 2004, 2009,
+ *   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
  * as published by the Free Software Foundation; either version 3 of
@@ -26,6 +26,7 @@
 #include <errno.h>
 #include <signal.h>  /* for SIG constants */
 #include <stdlib.h>  /* for getenv */
+#include <stdio.h>
 
 #include "libguile/_scm.h"
 
@@ -39,13 +40,15 @@
 #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
@@ -87,8 +90,6 @@ SCM_DEFINE (scm_system, "system", 0, 1, 0,
 
 
 #ifdef HAVE_SYSTEM
-#ifdef HAVE_WAITPID
-
 
 SCM_DEFINE (scm_system_star, "system*", 0, 0, 1,
            (SCM args),
@@ -116,31 +117,48 @@ SCM_DEFINE (scm_system_star, "system*", 0, 0, 1,
   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 */
       execargv = scm_i_allocate_string_pointers (args);
 
       /* make sure the child can't kill us (as per normal system call) */
-      sig_ign = scm_from_long ((unsigned long) SIG_IGN);
+      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)
         {
           /* child */
-          execvp (execargv[0], execargv);
-          SCM_SYSERROR;
-          /* not reached.  */
-          return SCM_BOOL_F;
+         execvp (execargv[0], execargv);
+
+         /* Something went wrong.  */
+         fprintf (stderr, "In execvp of %s: %s\n",
+                  execargv[0], strerror (errno));
+
+         /* Exit directly instead of throwing, because otherwise this
+            process may keep on running.  Use exit status 127, like
+            shells in this case, as per POSIX
+            <http://pubs.opengroup.org/onlinepubs/007904875/utilities/xcu_chap02.html#tag_02_09_01_01>.  */
+         _exit (127);
         }
       else
         {
@@ -158,18 +176,26 @@ SCM_DEFINE (scm_system_star, "system*", 0, 0, 1,
 
           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 */
 
 
 SCM_DEFINE (scm_getenv, "getenv", 1, 0, 0, 
             (SCM nam),
-           "Looks up the string @var{name} in the current environment.  The return\n"
+           "Looks up the string @var{nam} in the current environment.  The return\n"
            "value is @code{#f} unless a string of the form @code{NAME=VALUE} is\n"
            "found, in which case the string @code{VALUE} is returned.")
 #define FUNC_NAME s_scm_getenv
@@ -182,6 +208,21 @@ SCM_DEFINE (scm_getenv, "getenv", 1, 0, 0,
 }
 #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),