Allow ../../ in .cdecl include statements.

diff --git a/src/ffi/cdecls.scm b/src/ffi/cdecls.scm
index e9abe5fa26a438ed856bb378faedfe7bc9ec0fd6..4ec5360284cfaa155ae789d06621c77829d398dd 100644 (file)
--- 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 (->simple-pathname
+                   (merge-pathnames (pathname-default-type filename "cdecl")
+                                    cwd)))
         (new-cwd (directory-pathname pathname))
         (namestring (enough-namestring pathname twd))
         (modtime (file-modification-time-indirect namestring))
@@ -99,6 +100,14 @@ USA.
                                 kernel)
              (kernel))))))
 
+(define (->simple-pathname pathname)
+  (let loop ((count 0)
+            (simpler (pathname-simplify pathname)))
+    (let ((again (pathname-simplify simpler)))
+      (cond ((fix:> count 100) (error "Could not simplify:" pathname))
+           ((pathname=? again simpler) again)
+           (else (loop again (fix:1+ count)))))))
+
 (define read-environment
   (make-top-level-environment '(*PARSER-CANONICALIZE-SYMBOLS?*) '(#f)))