Use pathname-simplify to allow ../ in included paths.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Wed, 22 Jun 2011 15:01:38 +0000 (08:01 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Wed, 22 Jun 2011 15:01:38 +0000 (08:01 -0700)
src/ffi/cdecls.scm

index e9abe5fa26a438ed856bb378faedfe7bc9ec0fd6..956e59eb29834db4e1019a141216077253ad3fd3 100644 (file)
@@ -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))