summaryrefslogtreecommitdiff
path: root/libguile/load.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-02-08 11:48:08 +0100
committerAndy Wingo <wingo@pobox.com>2012-02-08 11:48:08 +0100
commit0858753e829fd399b55700688b4b2cb9c3ea6908 (patch)
tree55f97b3c1db7a33a181314663cb4e4750077fc3f /libguile/load.c
parent0aed71aa51e89e714de2392c2a5f44694dca77ea (diff)
parent817307ccac5027fd784798bbbf6ffb52e0a5d751 (diff)
downloadguile-0858753e829fd399b55700688b4b2cb9c3ea6908.tar.gz
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts: GUILE-VERSION libguile/gc-malloc.c libguile/ports.c
Diffstat (limited to 'libguile/load.c')
-rw-r--r--libguile/load.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/libguile/load.c b/libguile/load.c
index 135a621cb..86d7e53fb 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2004, 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2004, 2006, 2008,
+ * 2009, 2010, 2011, 2012 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 License
@@ -419,8 +420,9 @@ scm_c_string_has_an_ext (char *str, size_t len, SCM extensions)
/* Search PATH for a directory containing a file named FILENAME.
The file must be readable, and not a directory.
- If we find one, return its full filename; otherwise, return #f.
+ If we find one, return its full pathname; otherwise, return #f.
If FILENAME is absolute, return it unchanged.
+ We also fill *stat_buf corresponding to the returned pathname.
If given, EXTENSIONS is a list of strings; for each directory
in PATH, we search for FILENAME concatenated with each EXTENSION. */
static SCM
@@ -445,7 +447,7 @@ search_path (SCM path, SCM filename, SCM extensions, SCM require_exts,
filename_len = strlen (filename_chars);
scm_dynwind_free (filename_chars);
- /* If FILENAME is absolute, return it unchanged. */
+ /* If FILENAME is absolute and is still valid, return it unchanged. */
#ifdef __MINGW32__
if (((filename_len >= 1) &&
(filename_chars[0] == '/' || filename_chars[0] == '\\')) ||
@@ -457,14 +459,13 @@ search_path (SCM path, SCM filename, SCM extensions, SCM require_exts,
if (filename_len >= 1 && filename_chars[0] == '/')
#endif
{
- SCM res = filename;
- if (scm_is_true (require_exts) &&
- !scm_c_string_has_an_ext (filename_chars, filename_len,
+ if ((scm_is_false (require_exts) ||
+ scm_c_string_has_an_ext (filename_chars, filename_len,
extensions))
- res = SCM_BOOL_F;
-
- scm_dynwind_end ();
- return res;
+ && stat (filename_chars, stat_buf) == 0
+ && !(stat_buf->st_mode & S_IFDIR))
+ result = filename;
+ goto end;
}
/* If FILENAME has an extension, don't try to add EXTENSIONS to it. */
@@ -483,8 +484,7 @@ search_path (SCM path, SCM filename, SCM extensions, SCM require_exts,
{
/* This filename has an extension, but not one of the right
ones... */
- scm_dynwind_end ();
- return SCM_BOOL_F;
+ goto end;
}
/* This filename already has an extension, so cancel the
list of extensions. */
@@ -571,9 +571,9 @@ SCM_DEFINE (scm_search_path, "search-path", 2, 0, 1,
"@var{filename}. The file must be readable, and not a directory.\n"
"If we find one, return its full filename; otherwise, return\n"
"@code{#f}. If @var{filename} is absolute, return it unchanged.\n"
- "If given, @var{extensions} is a list of strings; for each\n"
+ "If given, @var{rest} is a list of extension strings; for each\n"
"directory in @var{path}, we search for @var{filename}\n"
- "concatenated with each @var{extension}.")
+ "concatenated with each extension.")
#define FUNC_NAME s_scm_search_path
{
SCM extensions, require_exts;