-/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2003 Free Software
+/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2003, 2004 Free Software
* Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
*
* 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
*/
\f
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <errno.h>
+#include <signal.h> /* for SIG constants */
#include <stdlib.h> /* for getenv */
#include "libguile/_scm.h"
#include "libguile/validate.h"
#include "libguile/simpos.h"
+#include "libguile/dynwind.h"
#ifdef HAVE_STRING_H
#include <string.h>
"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);
- return SCM_BOOL(rv);
+ return scm_from_bool(rv);
}
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_MAKINUM (rv);
+ return scm_from_int (rv);
}
#undef FUNC_NAME
#endif /* HAVE_SYSTEM */
#ifdef HAVE_SYSTEM
#ifdef HAVE_WAITPID
-/* return a newly allocated array of char pointers to each of the strings
- in args, with a terminating NULL pointer. */
-/* Note: a similar function is defined in dynl.c, but we don't necessarily
- want to export it. */
-static char **
-allocate_string_pointers (SCM args)
+static void
+free_string_pointers (void *data)
{
- char **result;
- int n_args = scm_ilength (args);
- int i;
-
- SCM_ASSERT (n_args >= 0, args, SCM_ARGn, "allocate_string_pointers");
- result = (char **) scm_malloc ((n_args + 1) * sizeof (char *));
- result[n_args] = NULL;
- for (i = 0; i < n_args; i++)
- {
- SCM car = SCM_CAR (args);
-
- if (!SCM_STRINGP (car))
- {
- free (result);
- scm_wrong_type_arg ("allocate_string_pointers", SCM_ARGn, car);
- }
- result[i] = SCM_STRING_CHARS (SCM_CAR (args));
- args = SCM_CDR (args);
- }
- return result;
+ scm_i_free_string_pointers ((char **)data);
}
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;
int pid;
char **execargv;
- SCM_VALIDATE_STRING (1, SCM_CAR (args));
+ scm_dynwind_begin (0);
+
/* allocate before fork */
- execargv = allocate_string_pointers (args);
+ execargv = scm_i_allocate_string_pointers (args);
+ scm_dynwind_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_long2num ((long) SIG_IGN);
- sigint = scm_long2num (SIGINT);
- sigquit = scm_long2num (SIGQUIT);
+ sig_ign = scm_from_long ((unsigned long) SIG_IGN);
+ sigint = scm_from_int (SIGINT);
+ sigquit = scm_from_int (SIGQUIT);
oldint = scm_sigaction (sigint, sig_ign, SCM_UNDEFINED);
oldquit = scm_sigaction (sigquit, sig_ign, SCM_UNDEFINED);
pid = fork ();
- if (pid == -1)
- SCM_SYSERROR;
- else if (pid)
+ if (pid == 0)
{
- int wait_result;
- int status;
- SCM_SYSCALL (wait_result = waitpid (pid, &status, 0));
- if (wait_result == -1) SCM_SYSERROR;
- scm_sigaction (sigint, SCM_CAR (oldint), SCM_CDR (oldint));
- scm_sigaction (sigquit, SCM_CAR (oldquit), SCM_CDR (oldquit));
- scm_remember_upto_here_2 (oldint, oldquit);
- return SCM_MAKINUM (0L + status);
- }
- else
- {
- execvp (SCM_STRING_CHARS (SCM_CAR (args)), execargv);
- scm_remember_upto_here_1 (args);
+ /* child */
+ execvp (execargv[0], execargv);
SCM_SYSERROR;
/* not reached. */
+ scm_dynwind_end ();
return SCM_BOOL_F;
}
+ else
+ {
+ /* parent */
+ int wait_result, status;
+
+ if (pid == -1)
+ SCM_SYSERROR;
+
+ SCM_SYSCALL (wait_result = waitpid (pid, &status, 0));
+ if (wait_result == -1)
+ SCM_SYSERROR;
+ scm_sigaction (sigint, SCM_CAR (oldint), SCM_CDR (oldint));
+ scm_sigaction (sigquit, SCM_CAR (oldquit), SCM_CDR (oldquit));
+
+ scm_dynwind_end ();
+ return scm_from_int (status);
+ }
}
else
- SCM_WRONG_TYPE_ARG (1, SCM_CAR (args));
+ SCM_WRONG_TYPE_ARG (1, args);
}
#undef FUNC_NAME
#endif /* HAVE_WAITPID */
#define FUNC_NAME s_scm_getenv
{
char *val;
- SCM_VALIDATE_STRING (1, nam);
- val = getenv (SCM_STRING_CHARS (nam));
- return val ? scm_mem2string (val, strlen (val)) : SCM_BOOL_F;
+ char *var = scm_to_locale_string (nam);
+ val = getenv (var);
+ free (var);
+ return val ? scm_from_locale_string (val) : SCM_BOOL_F;
}
#undef FUNC_NAME
/* 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;
if (!SCM_UNBNDP (status))
- {
- SCM_VALIDATE_INUM (1, status);
- cstatus = SCM_INUM (status);
- }
+ cstatus = scm_to_int (status);
exit (cstatus);
}
#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 ()
HCoop / bpt / guile.git / blobdiff