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 55d25f1..1d44a77 100644 (file)
--- a/libguile/feature.c
+++ b/libguile/feature.c
@@ -1,46 +1,25 @@
-/* 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 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
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- * 
- * This program 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 General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ * 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.
  *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE.  If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
+ * 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.
  *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  */
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 
 
 \f
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -50,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);
 }
 
@@ -77,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
 
@@ -90,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);
 }
 
 
@@ -101,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");
@@ -117,13 +100,11 @@ scm_init_feature()
 #ifndef CHEAP_CONTINUATIONS
   scm_add_feature ("full-continuation");
 #endif
-#ifdef USE_THREADS
-#ifndef USE_NULL_THREADS
+#if SCM_USE_PTHREAD_THREADS
   scm_add_feature ("threads");
 #endif
-#endif
-  
-  scm_c_define ("char-code-limit", SCM_MAKINUM (SCM_CHAR_CODE_LIMIT));
+
+  scm_c_define ("char-code-limit", scm_from_int (SCM_CHAR_CODE_LIMIT));
 
 #include "libguile/feature.x"
 }