From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Wed, 22 Jun 2011 15:01:38 +0000 (-0700)
Subject: Use pathname-simplify to allow ../ in included paths.
X-Git-Tag: mit-scheme-pucked-9.2.12~702
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=864e4aae180370cca28b95739724f4c32bed9595;p=mit-scheme.git

Use pathname-simplify to allow ../ in included paths.
---

diff --git a/src/ffi/cdecls.scm b/src/ffi/cdecls.scm
index e9abe5fa2..956e59eb2 100644
--- a/src/ffi/cdecls.scm
+++ b/src/ffi/cdecls.scm
@@ -71,8 +71,9 @@ USA.
   ;; FILENAME relative to CWD (current working directory).
   ;; Abbreviates namestrings under TWD (topmost working, build directory).
 
-  (let* ((pathname (merge-pathnames
-		    (pathname-default-type filename "cdecl") cwd))
+  (let* ((pathname (pathname-simplify
+		    (merge-pathnames
+		     (pathname-default-type filename "cdecl") cwd)))
 	 (new-cwd (directory-pathname pathname))
 	 (namestring (enough-namestring pathname twd))
 	 (modtime (file-modification-time-indirect namestring))