Fixed a typo/bug in `make-doubly-weak-alist-vector'.

[bpt/guile.git] / libguile / feature.c

diff --git a/libguile/feature.c b/libguile/feature.c
index e6b2123..1d44a77 100644 (file)
--- a/libguile/feature.c
+++ b/libguile/feature.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002, 2003, 2004, 2006 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
@@ -12,7 +12,7 @@
  *
  * 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
  */
 
 
@@ -29,19 +29,20 @@
 #include "libguile/root.h"
 #include "libguile/strings.h"
 #include "libguile/validate.h"
+#include "libguile/fluids.h"
 
 #include "libguile/feature.h"
 
 \f
 
+static SCM progargs_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_locale_symbol (str), old);
   SCM_VARIABLE_SET (features_var, new);
 }
 
@@ -56,7 +57,7 @@ SCM_DEFINE (scm_program_arguments, "program-arguments", 0, 0, 0,
            "options like @code{-e} and @code{-l}.")
 #define FUNC_NAME s_scm_program_arguments
 {
-  return scm_progargs;
+  return scm_fluid_ref (progargs_fluid);
 }
 #undef FUNC_NAME
 
@@ -69,9 +70,10 @@ SCM_DEFINE (scm_program_arguments, "program-arguments", 0, 0, 0,
 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 (progargs_fluid, args);
 }
 
 
@@ -80,6 +82,8 @@ scm_set_program_arguments (int argc, char **argv, char *first)
 void
 scm_init_feature()
 {
+  progargs_fluid = scm_permanent_object (scm_make_fluid ());
+
   features_var = scm_c_define ("*features*", SCM_EOL);
 #ifndef _Windows
   scm_add_feature("system");
@@ -96,8 +100,10 @@ scm_init_feature()
 #ifndef CHEAP_CONTINUATIONS
   scm_add_feature ("full-continuation");
 #endif
+#if SCM_USE_PTHREAD_THREADS
   scm_add_feature ("threads");
-  
+#endif
+
   scm_c_define ("char-code-limit", scm_from_int (SCM_CHAR_CODE_LIMIT));
 
 #include "libguile/feature.x"