From 7992f81741cb7dd344fd3cad39e82ea7eddc4642 Mon Sep 17 00:00:00 2001 From: jgarcia Date: Fri, 5 Jan 2007 18:02:22 +0000 Subject: [PATCH] Fixed interpretation and check of :BACK in make-pathname --- src/CHANGELOG | 2 +- src/c/pathname.d | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index d01e24653..a6bdb91a9 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -118,7 +118,7 @@ ECL 1.0: double-float. - MAKE-PATHNAME should remove all occurrences of single dots "." in physical - pathnames. + pathnames and does not interpret the directory component :BACK properly. * Unicode: diff --git a/src/c/pathname.d b/src/c/pathname.d index addf3380b..60c2ff8e4 100644 --- a/src/c/pathname.d +++ b/src/c/pathname.d @@ -77,9 +77,9 @@ destructively_check_directory(cl_object directory, bool logical) item = nth(i-1, directory); if (item == @':absolute' || item == @':wild-inferiors') return @':error'; - if (i > 2) + if (i >= 2) CDR(nthcdr(i-2, directory)) = CDR(ptr); - } if (item == @':up') { + } else if (item == @':up') { if (i == 0) return @':error'; item = nth(i-1, directory);