-/* Copyright (C) 1995,1996,1997,1998,2000,2001 Free Software Foundation, Inc.
+/* 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
* modify it under the terms of the GNU Lesser General Public
*
* 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
*/
#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>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
+#if HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif
+
+#include "posix.h"
\f
extern int system();
\f
#ifdef HAVE_SYSTEM
-SCM_DEFINE (scm_system, "system", 0, 1, 0,
+SCM_DEFINE (scm_system, "system", 0, 1, 0,
(SCM cmd),
"Execute @var{cmd} using the operating system's \"command\n"
"processor\". Under Unix this is usually the default shell\n"
"@code{sh}. The value returned is @var{cmd}'s exit status as\n"
- "returned by @code{waitpid}, which can be interpreted using the\n"
- "functions above.\n"
+ "returned by @code{waitpid}, which can be interpreted using\n"
+ "@code{status:exit-val} and friends.\n"
"\n"
"If @code{system} is called without arguments, return a boolean\n"
"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);
- SCM_DEFER_INTS;
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;
- SCM_ALLOW_INTS;
- return SCM_MAKINUM (rv);
+ return scm_from_int (rv);
}
#undef FUNC_NAME
#endif /* HAVE_SYSTEM */
+
+#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),
+"Execute the command indicated by @var{args}. The first element must\n"
+"be a string indicating the command to be executed, and the remaining\n"
+"items must be strings representing each of the arguments to that\n"
+"command.\n"
+"\n"
+"This function returns the exit status of the command as provided by\n"
+"@code{waitpid}. This value can be handled with @code{status:exit-val}\n"
+"and the related functions.\n"
+"\n"
+"@code{system*} is similar to @code{system}, but accepts only one\n"
+"string per-argument, and performs no shell interpretation. The\n"
+"command is executed using fork and execlp. Accordingly this function\n"
+"may be safer than @code{system} in situations where shell\n"
+"interpretation is not required.\n"
+"\n"
+"Example: (system* \"echo\" \"foo\" \"bar\")")
+#define FUNC_NAME s_scm_system_star
+{
+ if (scm_is_null (args))
+ SCM_WRONG_NUM_ARGS ();
+
+ if (scm_is_pair (args))
+ {
+ SCM oldint;
+ SCM oldquit;
+ SCM sig_ign;
+ SCM sigint;
+ SCM sigquit;
+ 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);
+ 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 == 0)
+ {
+ /* child */
+ execvp (execargv[0], execargv);
+ SCM_SYSERROR;
+ /* not reached. */
+ scm_frame_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_frame_end ();
+ return scm_from_int (status);
+ }
+ }
+ 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"
#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
{
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
HCoop / bpt / guile.git / blobdiff