-/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002 Free Software Foundation, Inc.
- *
+/* Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ * 2006, 2007, 2009, 2011 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
*/
\f
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include "libguile/root.h"
#include "libguile/strings.h"
#include "libguile/validate.h"
+#include "libguile/fluids.h"
#include "libguile/feature.h"
\f
-static SCM features_var;
+SCM scm_program_arguments_fluid;
+static SCM features_var;
void
scm_add_feature (const char *str)
{
SCM old = SCM_VARIABLE_REF (features_var);
- SCM new = scm_cons (scm_str2symbol (str), old);
+ SCM new = scm_cons (scm_from_utf8_symbol (str), old);
SCM_VARIABLE_SET (features_var, new);
}
"options like @code{-e} and @code{-l}.")
#define FUNC_NAME s_scm_program_arguments
{
- return scm_progargs;
+ return scm_fluid_ref (scm_program_arguments_fluid);
}
#undef FUNC_NAME
void
scm_set_program_arguments (int argc, char **argv, char *first)
{
- scm_progargs = scm_makfromstrs (argc, argv);
+ SCM args = scm_makfromstrs (argc, argv);
if (first)
- scm_progargs = scm_cons (scm_makfrom0str (first), scm_progargs);
+ args = scm_cons (scm_from_locale_string (first), args);
+ scm_fluid_set_x (scm_program_arguments_fluid, args);
+}
+
+SCM_DEFINE (scm_set_program_arguments_scm, "set-program-arguments", 1, 0, 0,
+ (SCM lst),
+ "Set the command line arguments to be returned by\n"
+ "@code{program-arguments} (and @code{command-line}). @var{lst}\n"
+ "should be a list of strings, the first of which is the program\n"
+ "name (either a script name, or just @code{\"guile\"}).\n"
+ "\n"
+ "Program arguments are held in a fluid and therefore have a\n"
+ "separate value in each Guile thread. Neither the list nor the\n"
+ "strings within it are copied, so should not be modified later.")
+#define FUNC_NAME s_scm_set_program_arguments_scm
+{
+ return scm_fluid_set_x (scm_program_arguments_fluid, lst);
}
+#undef FUNC_NAME
\f
void
scm_init_feature()
{
+ scm_program_arguments_fluid = scm_make_fluid ();
+
features_var = scm_c_define ("*features*", SCM_EOL);
#ifndef _Windows
scm_add_feature("system");
#ifdef vms
scm_add_feature(s_ed);
#endif
-#ifdef SICP
- scm_add_feature("sicp");
-#endif
#ifndef GO32
scm_add_feature("char-ready?");
#endif
-#ifndef CHEAP_CONTINUATIONS
- scm_add_feature ("full-continuation");
-#endif
-#if SCM_USE_NULL_THREADS
+#if SCM_USE_PTHREAD_THREADS
scm_add_feature ("threads");
#endif
-
- scm_c_define ("char-code-limit", SCM_MAKINUM (SCM_CHAR_CODE_LIMIT));
#include "libguile/feature.x"
}