summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Vollmer <mvo@zagadka.de>2004-08-12 11:57:42 +0000
committerMarius Vollmer <mvo@zagadka.de>2004-08-12 11:57:42 +0000
commitffa747a6ead5e8ba3c6af1fc26c4bbaa72e2d72b (patch)
tree1f14a8eb93e27c92cd12e0e3dc9e06543cb8303d
parentbb26cc2d28d8398385ac2e5c8390666526f64d22 (diff)
downloadguile-ffa747a6ead5e8ba3c6af1fc26c4bbaa72e2d72b.tar.gz
(scm_primitive_load_path): Do not check for absolute filenames when
scm_sys_search_load_path returns false, which will return absolute filenames unchanged.
-rw-r--r--libguile/load.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/libguile/load.c b/libguile/load.c
index 938a86c94..449855224 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -468,24 +468,11 @@ SCM_DEFINE (scm_primitive_load_path, "primitive-load-path", 1, 0, 0,
{
SCM full_filename;
- SCM_VALIDATE_STRING (1, filename);
-
full_filename = scm_sys_search_load_path (filename);
if (scm_is_false (full_filename))
- {
- int absolute = (SCM_STRING_LENGTH (filename) >= 1
-#ifdef __MINGW32__
- && (SCM_STRING_CHARS (filename)[0] == '/' ||
- SCM_STRING_CHARS (filename)[0] == '\\'));
-#else
- && SCM_STRING_CHARS (filename)[0] == '/');
-#endif
- SCM_MISC_ERROR ((absolute
- ? "Unable to load file ~S"
- : "Unable to find file ~S in load path"),
- scm_list_1 (filename));
- }
+ SCM_MISC_ERROR ("Unable to find file ~S in load path",
+ scm_list_1 (filename));
return scm_primitive_load (full_filename);
}