-/* Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,2000,2001 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice. */
-/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
- gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
\f
-#include <stdio.h>
-#include "_scm.h"
+#include <errno.h>
-#include "scmsigs.h"
+#include "libguile/_scm.h"
-#include "scm_validate.h"
-#include "simpos.h"
+#include "libguile/scmsigs.h"
+#include "libguile/strings.h"
+
+#include "libguile/validate.h"
+#include "libguile/simpos.h"
#ifdef HAVE_STRING_H
#include <string.h>
extern int system();
\f
-GUILE_PROC(scm_system, "system", 0, 1, 0,
+#ifdef HAVE_SYSTEM
+SCM_DEFINE (scm_system, "system", 0, 1, 0,
(SCM cmd),
-"Executes @var{cmd} using the operating system's "command processor".
-Under Unix this is usually the default shell @code{sh}. The value
-returned is @var{cmd}'s exit status as returned by @code{waitpid}, which
-can be interpreted using the functions above.
-
-If @code{system} is called without arguments, it returns a boolean
-indicating whether the command processor is available.")
+ "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"
+ "\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;
if (SCM_UNBNDP (cmd))
{
-#ifdef HAVE_SYSTEM
rv = system (NULL);
-#else
- rv = 0;
-#endif
return SCM_BOOL(rv);
}
- SCM_VALIDATE_ROSTRING(1,cmd);
-#ifdef HAVE_SYSTEM
+ SCM_VALIDATE_STRING (1, cmd);
SCM_DEFER_INTS;
errno = 0;
- if (SCM_ROSTRINGP (cmd))
- cmd = scm_makfromstr (SCM_ROCHARS (cmd), SCM_ROLENGTH (cmd), 0);
- rv = system(SCM_ROCHARS(cmd));
+ rv = system (SCM_STRING_CHARS (cmd));
if (rv == -1 || (rv == 127 && errno != 0))
SCM_SYSERROR;
SCM_ALLOW_INTS;
return SCM_MAKINUM (rv);
-#else
- SCM_SYSMISSING;
-#endif
}
#undef FUNC_NAME
+#endif /* HAVE_SYSTEM */
extern char *getenv();
-GUILE_PROC (scm_getenv, "getenv", 1, 0, 0,
+SCM_DEFINE (scm_getenv, "getenv", 1, 0, 0,
(SCM nam),
-"Looks up the string @var{name} in the current environment. The return
-value is @code{#f} unless a string of the form @code{NAME=VALUE} is
-found, in which case the string @code{VALUE} is
-returned.")
+ "Looks up the string @var{name} 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
{
char *val;
- SCM_VALIDATE_ROSTRING(1,nam);
- nam = scm_makfromstr (SCM_ROCHARS (nam), SCM_ROLENGTH (nam), 0);
- val = getenv(SCM_CHARS(nam));
- return (val) ? scm_makfromstr(val, (scm_sizet)strlen(val), 0) : SCM_BOOL_F;
+ SCM_VALIDATE_STRING (1, nam);
+ val = getenv (SCM_STRING_CHARS (nam));
+ return val ? scm_mem2string (val, strlen (val)) : SCM_BOOL_F;
}
#undef FUNC_NAME
/* simple exit, without unwinding the scheme stack or flushing ports. */
-GUILE_PROC (scm_primitive_exit, "primitive-exit", 0, 1, 0,
+SCM_DEFINE (scm_primitive_exit, "primitive-exit", 0, 1, 0,
(SCM status),
-"Terminate the current process without unwinding the Scheme stack.
-This is would typically be useful after a fork. The exit status
-is @var{status} if supplied, otherwise zero.")
+ "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.")
#define FUNC_NAME s_scm_primitive_exit
{
int cstatus = 0;
if (!SCM_UNBNDP (status))
{
- SCM_VALIDATE_INUM(1,status);
+ SCM_VALIDATE_INUM (1, status);
cstatus = SCM_INUM (status);
}
exit (cstatus);
void
scm_init_simpos ()
{
-#include "simpos.x"
+#include "libguile/simpos.x"
}
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/