mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-10 05:50:26 +02:00
Code Activity

* load.c (scm_init_load_path): Check GUILE_LOAD_PATH environment

Browse source 
variable first; then SCHEME_LOAD_PATH, with a warning message.
(scm_parse_path): New function.
* script.c: Doc fixes.
This commit is contained in:
Jim Blandy 1997-10-25 06:53:11 +00:00
parent 51e6b88353
commit 01cddfc1e8
2 changed files with 40 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

57
libguile/load.c
View file

@ -121,9 +121,37 @@ static SCM *scm_loc_load_path;
/* List of extensions we try adding to the filenames. */
static SCM *scm_loc_load_extensions;
/* Parse the null-terminated string PATH as if it were a standard path
environment variable (i.e. a colon-separated list of strings), and
prepend the elements to TAIL. */
SCM
scm_parse_path (char *path, SCM tail)
{
if (path && path[0] != '\0')
{
char *scan, *elt_end;
/* Scan backwards from the end of the string, to help
construct the list in the right order. */
scan = elt_end = path + strlen (path);
do {
/* Scan back to the beginning of the current element. */
do scan--;
while (scan >= path && *scan != ':');
tail = scm_cons (scm_makfromstr (scan + 1, elt_end - (scan + 1), 0),
tail);
elt_end = scan;
} while (scan >= path);
}
return tail;
}
/* Initialize the global variable %load-path, given the value of the
SCM_SITE_DIR and SCM_LIBRARY_DIR preprocessor symbols and the
SCHEME_LOAD_PATH environment variable. */
GUILE_LOAD_PATH environment variable. */
void
scm_init_load_path ()
{
@ -135,28 +163,21 @@ scm_init_load_path ()
scm_makfrom0str (SCM_PKGDATA_DIR),
SCM_UNDEFINED);
#endif /* SCM_LIBRARY_DIR */
/* For compatibility, we still check this, but give a warning. */
{
char *path_string = getenv ("SCHEME_LOAD_PATH");
if (path_string && path_string[0] != '\0')
char *p = getenv ("SCHEME_LOAD_PATH");
if (p && p[0] != '\0')
{
char *scan, *elt_end;
/* Scan backwards from the end of the string, to help
construct the list in the right order. */
scan = elt_end = path_string + strlen (path_string);
do {
/* Scan back to the beginning of the current element. */
do scan--;
while (scan >= path_string && *scan != ':');
path = scm_cons (scm_makfromstr (scan + 1, elt_end - (scan + 1), 0),
path);
elt_end = scan;
} while (scan >= path_string);
fprintf (stderr, "guile: warning: SCHEME_LOAD_PATH variable will be"
" removed by Guile 1.4;\n"
" use GUILE_LOAD_PATH instead\n");
path = scm_parse_path (p, path);
}
}
path = scm_parse_path (getenv ("GUILE_LOAD_PATH"), path);
*scm_loc_load_path = path;
}

2
libguile/script.c
View file

@ -618,7 +618,7 @@ scm_compile_shell_switches (int argc, char **argv)
scm_mask_ints = 0;
}
{
/* We want a path only containing directories from SCHEME_LOAD_PATH,
/* We want a path only containing directories from GUILE_LOAD_PATH,
SCM_SITE_DIR and SCM_LIBRARY_DIR when searching for the site init
file, so we do this before loading Ice-9. */
SCM init_path = scm_sys_search_load_path (scm_makfrom0str ("init.scm"));