From 825599ef075ce4dfc52f7784506ff8b08c703ef8 Mon Sep 17 00:00:00 2001
From: Juan Jose Garcia Ripoll <jjgarcia@jjgr.(none)>
Date: Sun, 5 Oct 2008 14:34:26 +0200
Subject: [PATCH] Some symbols move to EXT package

---
 src/CHANGELOG         |  3 +++
 src/c/main.d          |  6 +++---
 src/c/symbols_list.h  |  2 +-
 src/c/symbols_list2.h | 11 +++++------
 src/c/unixfsys.d      |  2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index ae557120c..1fd3eaf35 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -63,6 +63,9 @@ ECL 8.9.0:
  - EXT:RUN-PROGRAM now returns two values: the two way stream and the exit code
    of the process if :WAIT is T (Josh Elsasser)
 
+ - Some symbols now belong in the EXT package: EXT:GETENV, EXT:SETENV,
+   EXT:GETCWD, EXT:CHDIR.
+
 * Embedding:
 
  - ECL now implements a more transparent interface for setting and querying
diff --git a/src/c/main.d b/src/c/main.d
index 1e85c4906..ef82826b1 100644
--- a/src/c/main.d
+++ b/src/c/main.d
@@ -51,7 +51,7 @@ const char *ecl_self;
 
 static int ARGC;
 static char **ARGV;
-static cl_fixnum option_values[ECL_OPT_LIMIT] = {
+static cl_fixnum option_values[ECL_OPT_LIMIT+1] = {
 #ifdef GBC_BOEHM_GENGC
 	1,	/* ECL_OPT_INCREMENTAL_GC */
 #else
@@ -607,7 +607,7 @@ si_getenv(cl_object var)
 {
 	const char *value;
 
-	var = ecl_check_cl_type(@'si::getenv', var, t_base_string);
+	var = ecl_check_cl_type(@'ext::getenv', var, t_base_string);
 	value = getenv(var->base_string.self);
 	@(return ((value == NULL)? Cnil : make_base_string_copy(value)))
 }
@@ -618,7 +618,7 @@ si_setenv(cl_object var, cl_object value)
 {
 	cl_fixnum ret_val;
 
-	var = ecl_check_cl_type(@'si::setenv', var, t_base_string);
+	var = ecl_check_cl_type(@'ext::setenv', var, t_base_string);
 	if (value == Cnil) {
 #ifdef HAVE_SETENV
 		/* Remove the variable when setting to nil, so that
diff --git a/src/c/symbols_list.h b/src/c/symbols_list.h
index 69446532d..7b14acbd1 100644
--- a/src/c/symbols_list.h
+++ b/src/c/symbols_list.h
@@ -1169,7 +1169,7 @@ cl_symbols[] = {
 {SYS_ "SELECT-PACKAGE", SI_ORDINARY, si_select_package, 1, OBJNULL},
 {SYS_ "SET-SYMBOL-PLIST", SI_ORDINARY, si_set_symbol_plist, 2, OBJNULL},
 #if defined(HAVE_PUTENV) || defined(HAVE_SETENV)
-{SYS_ "SETENV", SI_ORDINARY, si_setenv, 2, OBJNULL},
+{EXT_ "SETENV", SI_ORDINARY, si_setenv, 2, OBJNULL},
 #endif
 {SYS_ "SETF-LAMBDA", SI_ORDINARY, NULL, -1, OBJNULL},
 {SYS_ "SETF-METHOD", SI_ORDINARY, NULL, -1, OBJNULL},
diff --git a/src/c/symbols_list2.h b/src/c/symbols_list2.h
index 9053b4cca..787bb8820 100644
--- a/src/c/symbols_list2.h
+++ b/src/c/symbols_list2.h
@@ -1077,7 +1077,7 @@ cl_symbols[] = {
 {SYS_ "BIT-ARRAY-OP","si_bit_array_op"},
 {SYS_ "C-ARGUMENTS-LIMIT",NULL},
 {SYS_ "CHAR-SET","si_char_set"},
-{SYS_ "CHDIR","si_chdir"},
+{EXT_ "CHDIR","si_chdir"},
 {SYS_ "CLEAR-COMPILER-PROPERTIES","cl_identity"},
 {SYS_ "COERCE-TO-BASE-STRING","si_coerce_to_base_string"},
 {SYS_ "COERCE-TO-EXTENDED-STRING","si_coerce_to_extended_string"},
@@ -1113,8 +1113,8 @@ cl_symbols[] = {
 {SYS_ "GET-LIBRARY-PATHNAME","si_get_library_pathname"},
 #endif
 {SYS_ "GET-SYSPROP","si_get_sysprop"},
-{SYS_ "GETENV","si_getenv"},
-{SYS_ "GETCWD","si_getcwd"},
+{EXT_ "GETENV","si_getenv"},
+{EXT_ "GETCWD","si_getcwd"},
 {SYS_ "GETPID","si_getpid"},
 {SYS_ "HASH-SET","si_hash_set"},
 {SYS_ "HASH-TABLE-ITERATOR","si_hash_table_iterator"},
@@ -1140,7 +1140,7 @@ cl_symbols[] = {
 {SYS_ "MKDIR","si_mkdir"},
 {SYS_ "MKSTEMP","si_mkstemp"},
 {SYS_ "RMDIR","si_rmdir"},
-{SYS_ "MAKE-PIPE","si_make_pipe"},
+{EXT_ "MAKE-PIPE","si_make_pipe"},
 {SYS_ "PACKAGE-LOCK","si_package_lock"},
 {SYS_ "PACKAGE-HASH-TABLES","si_package_hash_tables"},
 {SYS_ "PATHNAME-TRANSLATIONS","si_pathname_translations"},
@@ -1169,7 +1169,7 @@ cl_symbols[] = {
 {SYS_ "SELECT-PACKAGE","si_select_package"},
 {SYS_ "SET-SYMBOL-PLIST","si_set_symbol_plist"},
 #if defined(HAVE_PUTENV) || defined(HAVE_SETENV)
-{SYS_ "SETENV","si_setenv"},
+{EXT_ "SETENV","si_setenv"},
 #endif
 {SYS_ "SETF-LAMBDA",NULL},
 {SYS_ "SETF-METHOD",NULL},
@@ -1204,7 +1204,6 @@ cl_symbols[] = {
 #ifndef CLOS
 {SYS_ "STRUCTURE-INCLUDE",NULL},
 #else
-{SYS_ "CHANGE-INSTANCE",NULL},
 {SYS_ "COPY-INSTANCE","si_copy_instance"},
 {SYS_ "GENERIC-FUNCTION-P","si_generic_function_p"},
 {SYS_ "INSTANCE-REF-SAFE","si_instance_ref_safe"},
diff --git a/src/c/unixfsys.d b/src/c/unixfsys.d
index 6b482a502..b9972a59d 100644
--- a/src/c/unixfsys.d
+++ b/src/c/unixfsys.d
@@ -844,7 +844,7 @@ si_get_library_pathname(void)
 }
 #endif
 
-@(defun si::chdir (directory &optional change_d_p_d)
+@(defun ext::chdir (directory &optional change_d_p_d)
 	cl_object previous = si_getcwd();
 	cl_object namestring;
 @