mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

fix compilation under mingw

Browse source 
* libguile/load.c (is_absolute_file_name, search_path): Fix compilation
  under mingw.
This commit is contained in:
Andy Wingo 2013-03-05 14:42:32 +01:00
parent 6db7ee7b3a
commit e20cec744f
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libguile/load.c
View file

@ -478,23 +478,25 @@ is_drive_letter (SCM c)
} }
static int static int
is_absolute_file_name (const char *filename_chars, size_t filename_len) is_absolute_file_name (SCM filename)
{ {
size_t filename_len = scm_c_string_length (filename);
if (filename_len >= 1 if (filename_len >= 1
&& is_file_name_separator (SCM_MAKE_CHAR (filename_chars[0])) && is_file_name_separator (scm_c_string_ref (filename, 0))
#ifdef __MINGW32__ #ifdef __MINGW32__
/* On Windows, one initial separator indicates a drive-relative /* On Windows, one initial separator indicates a drive-relative
path. Two separators indicate a Universal Naming Convention path. Two separators indicate a Universal Naming Convention
(UNC) path. UNC paths are always absolute. */ (UNC) path. UNC paths are always absolute. */
&& filename_len >= 2 && filename_len >= 2
&& is_file_name_separator (SCM_MAKE_CHAR (filename_chars[1])) && is_file_name_separator (scm_c_string_ref (filename, 1))
#endif #endif
) )
return 1; return 1;
if (filename_len >= 3 if (filename_len >= 3
&& is_drive_letter (SCM_MAKE_CHAR (filename_chars[0])) && is_drive_letter (scm_c_string_ref (filename, 0))
&& filename_chars[1] == ':' && scm_is_eq (scm_c_string_ref (filename, 1), SCM_MAKE_CHAR (':'))
&& is_file_name_separator (SCM_MAKE_CHAR (filename_chars[2]))) && is_file_name_separator (scm_c_string_ref (filename, 2)))
return 1; return 1;
return 0; return 0;
} }
@ -529,7 +531,7 @@ search_path (SCM path, SCM filename, SCM extensions, SCM require_exts,
scm_dynwind_free (filename_chars); scm_dynwind_free (filename_chars);
/* If FILENAME is absolute and is still valid, return it unchanged. */ /* If FILENAME is absolute and is still valid, return it unchanged. */
if (is_absolute_file_name (filename_chars, filename_len)) if (is_absolute_file_name (filename))
{ {
if ((scm_is_false (require_exts) || if ((scm_is_false (require_exts) ||
scm_c_string_has_an_ext (filename_chars, filename_len, scm_c_string_has_an_ext (filename_chars, filename_len,