X-Git-Url: https://git.hcoop.net/bpt/guile.git/blobdiff_plain/7f9994d90437cfdaf6d733b9c3b050d66326f3bb..653ccd78fa6770c692f5a737ad70de5aedbfcc7f:/libguile/simpos.c

diff --git a/libguile/simpos.c b/libguile/simpos.c
index ff4637d61..84b8b9d67 100644
--- a/libguile/simpos.c
+++ b/libguile/simpos.c
@@ -1,24 +1,25 @@
-/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2003, 2004 Free Software
+/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2003, 2004, 2009, 2010 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 2.1 of the License, or (at your option) any later version.
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
  */
 
 
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 
@@ -64,8 +65,9 @@ SCM_DEFINE (scm_system, "system", 0, 1, 0,
 	    "indicating whether the command processor is available.")
 #define FUNC_NAME s_scm_system
 {
-  int rv;
-
+  int rv, eno;
+  char *c_cmd;
+  
   if (SCM_UNBNDP (cmd))
     {
       rv = system (NULL);
@@ -73,7 +75,9 @@ SCM_DEFINE (scm_system, "system", 0, 1, 0,
     }  
   SCM_VALIDATE_STRING (1, cmd);
   errno = 0;
-  rv = system (SCM_STRING_CHARS (cmd));
+  c_cmd = scm_to_locale_string (cmd);
+  rv = system (c_cmd);
+  eno = errno; free (c_cmd); errno = eno;
   if (rv == -1 || (rv == 127 && errno != 0))
     SCM_SYSERROR;
   return scm_from_int (rv);
@@ -85,11 +89,6 @@ SCM_DEFINE (scm_system, "system", 0, 1, 0,
 #ifdef HAVE_SYSTEM
 #ifdef HAVE_WAITPID
 
-static void
-free_string_pointers (void *data)
-{
-  scm_i_free_string_pointers ((char **)data);
-}
 
 SCM_DEFINE (scm_system_star, "system*", 0, 0, 1,
            (SCM args),
@@ -111,10 +110,10 @@ SCM_DEFINE (scm_system_star, "system*", 0, 0, 1,
 "Example: (system* \"echo\" \"foo\" \"bar\")")
 #define FUNC_NAME s_scm_system_star
 {
-  if (SCM_NULLP (args))
+  if (scm_is_null (args))
     SCM_WRONG_NUM_ARGS ();
 
-  if (SCM_CONSP (args))
+  if (scm_is_pair (args))
     {
       SCM oldint;
       SCM oldquit;
@@ -124,15 +123,11 @@ SCM_DEFINE (scm_system_star, "system*", 0, 0, 1,
       int pid;
       char **execargv;
 
-      scm_frame_begin (0);
-
       /* allocate before fork */
       execargv = scm_i_allocate_string_pointers (args);
-      scm_frame_unwind_handler (free_string_pointers, execargv,
-				SCM_F_WIND_EXPLICITLY);
 
       /* 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);
@@ -145,7 +140,6 @@ SCM_DEFINE (scm_system_star, "system*", 0, 0, 1,
           execvp (execargv[0], execargv);
           SCM_SYSERROR;
           /* not reached.  */
-	  scm_frame_end ();
           return SCM_BOOL_F;
         }
       else
@@ -162,7 +156,6 @@ SCM_DEFINE (scm_system_star, "system*", 0, 0, 1,
           scm_sigaction (sigint, SCM_CAR (oldint), SCM_CDR (oldint));
           scm_sigaction (sigquit, SCM_CAR (oldquit), SCM_CDR (oldquit));
 
-	  scm_frame_end ();
           return scm_from_int (status);
         }
     }
@@ -192,9 +185,9 @@ SCM_DEFINE (scm_getenv, "getenv", 1, 0, 0,
 /* simple exit, without unwinding the scheme stack or flushing ports.  */
 SCM_DEFINE (scm_primitive_exit, "primitive-exit", 0, 1, 0, 
             (SCM status),
-	    "Terminate the current process without unwinding the Scheme stack.\n"
-	    "This is would typically be useful after a fork.  The exit status\n"
-	    "is @var{status} if supplied, otherwise zero.")
+	    "Terminate the current process without unwinding the Scheme\n"
+	    "stack.  The exit status is @var{status} if supplied, otherwise\n"
+	    "zero.")
 #define FUNC_NAME s_scm_primitive_exit
 {
   int cstatus = 0;
@@ -204,6 +197,25 @@ SCM_DEFINE (scm_primitive_exit, "primitive-exit", 0, 1, 0,
 }
 #undef FUNC_NAME
 
+SCM_DEFINE (scm_primitive__exit, "primitive-_exit", 0, 1, 0,
+            (SCM status),
+	    "Terminate the current process using the _exit() system call and\n"
+	    "without unwinding the Scheme stack.  The exit status is\n"
+	    "@var{status} if supplied, otherwise zero.\n"
+	    "\n"
+	    "This function is typically useful after a fork, to ensure no\n"
+	    "Scheme cleanups or @code{atexit} handlers are run (those\n"
+	    "usually belonging in the parent rather than the child).")
+#define FUNC_NAME s_scm_primitive__exit
+{
+  int cstatus = 0;
+  if (!SCM_UNBNDP (status))
+    cstatus = scm_to_int (status);
+  _exit (cstatus);
+}
+#undef FUNC_NAME
+
+
 
 void
 scm_init_simpos ()