From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 13 Jun 2007 13:34:47 +0000 (+0000)
Subject: Fix thinko: OBJECT-FILE-PREFIX must always be a URI.
X-Git-Tag: 20090517-FFI~534
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=1dca606060232e8e7ba3d2dcb1b72b2de27ef828;p=mit-scheme.git

Fix thinko: OBJECT-FILE-PREFIX must always be a URI.
---

diff --git a/v7/src/runtime/load.scm b/v7/src/runtime/load.scm
index 9dcc11582..a05b87690 100644
--- a/v7/src/runtime/load.scm
+++ b/v7/src/runtime/load.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: load.scm,v 14.95 2007/06/06 19:42:42 cph Exp $
+$Id: load.scm,v 14.96 2007/06/13 13:34:47 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -325,10 +325,11 @@ USA.
      (object-file-prefix uri)))))
 
 (define (object-file-prefix uri)
-  (let ((pathname (uri->pathname uri #f)))
-    (if pathname
-	(directory-namestring pathname)
-	(uri->string
+  (uri->string
+   (let ((pathname (uri->pathname uri #f)))
+     (if pathname
+	 (pathname->uri
+	  (directory-pathname pathname))
 	 ;; This kludge has far too much knowledge of the URI
 	 ;; argument.  It's an expedient to work around the lack of
 	 ;; URI comparison operations.