diff --git a/src/c/pathname.d b/src/c/pathname.d index d84c6dcc61a0c659909aec1322b360a317c82b50..2733bdead2826190f609aac9e60a821981df403c 100644 --- a/src/c/pathname.d +++ b/src/c/pathname.d @@ -523,9 +523,7 @@ parse_directories(cl_object s, int flags, cl_index start, cl_index end, bool ecl_logical_hostname_p(cl_object host) { - if (!ecl_stringp(host)) - return FALSE; - return !Null(@assoc(4, host, cl_core.pathname_translations, @':test', @'string-equal')); + return ecl_stringp(host); } /* @@ -659,6 +657,7 @@ ecl_parse_namestring(cl_object s, cl_index start, cl_index end, cl_index *ep, if (!ecl_stringp(device)) { return ECL_NIL; } +#if defined(ECL_MS_WINDOWS_HOST) maybe_parse_host: /* Files have no effective device. */ if (@string-equal(2, device, @':file') == ECL_T) @@ -682,6 +681,7 @@ ecl_parse_namestring(cl_object s, cl_index start, cl_index end, cl_index *ep, } if (ecl_length(device) == 0) device = ECL_NIL; +#endif done_device_and_host: path = parse_directories(s, 0, *ep, end, ep); if (CONSP(path)) { @@ -1707,7 +1707,7 @@ copy_list_wildcards(cl_object *wilds, cl_object to) return l; } -@(defun translate-pathname (source from to &key ((:case scase) @':local')) +@(defun translate-pathname (source from to) cl_object wilds, d; cl_object host, device, directory, name, type, version; cl_object fromcase, tocase; diff --git a/src/h/external.h b/src/h/external.h index dba2dbda372fbd9948cb07dc91bd90f2447cb7ce..b448d42a0e45fd27c93419857482168c78e300d7 100755 --- a/src/h/external.h +++ b/src/h/external.h @@ -1346,7 +1346,7 @@ extern ECL_API cl_object cl_directory_namestring(cl_object pname); extern ECL_API cl_object cl_host_namestring(cl_object pname); extern ECL_API cl_object si_logical_pathname_p(cl_object pname); extern ECL_API cl_object cl_pathname_match_p(cl_object path, cl_object mask); -extern ECL_API cl_object cl_translate_pathname _ECL_ARGS((cl_narg narg, cl_object source, cl_object from, cl_object to, ...)); +extern ECL_API cl_object cl_translate_pathname _ECL_ARGS((cl_narg narg, cl_object source, cl_object from, cl_object to)); extern ECL_API cl_object cl_translate_logical_pathname _ECL_ARGS((cl_narg narg, cl_object source, ...)); extern ECL_API cl_object cl_parse_namestring _ECL_ARGS((cl_narg narg, cl_object thing, ...)); extern ECL_API cl_object cl_parse_logical_namestring _ECL_ARGS((cl_narg narg, cl_object thing, ...));