From 8977a7cc8587db6fa318fade4c3cb9894ca12c36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Kochma=C5=84ski?= Date: Sat, 2 May 2015 14:00:08 +0200 Subject: [PATCH] unixfsys.d: enter-directory: Coerce if directory is extended string. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If directory is of type (simple-array character(*)), then coerce it to (simple-array base-char (*)) instead of throwing an error. Signed-off-by: Daniel Kochmański --- src/c/unixfsys.d | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/c/unixfsys.d b/src/c/unixfsys.d index f9f6d5ce2..f5ee87ce6 100644 --- a/src/c/unixfsys.d +++ b/src/c/unixfsys.d @@ -268,9 +268,11 @@ enter_directory(cl_object base_dir, cl_object subdir, bool ignore_if_failure) } else if (subdir == @':up') { aux = make_constant_base_string(".."); } else if (!ECL_BASE_STRING_P(subdir)) { - FEerror("Directory component ~S found in pathname~& ~S" - "~&is not allowed in TRUENAME or DIRECTORY", - 1, subdir); + unlikely_if (!ecl_fits_in_base_string(subdir)) + FEerror("Directory component ~S found in pathname~& ~S" + "~&is not allowed in TRUENAME or DIRECTORY", + 1, subdir); + aux = si_coerce_to_base_string(subdir); } else { aux = subdir; }