From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 17 Jul 1991 08:54:53 +0000 (+0000)
Subject: Fix bug in DIRECTORY-READ: if the argument has any name component,
X-Git-Tag: 20090517-FFI~10448
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=47b8b43437ee4d91b117444217329fd97984053d;p=mit-scheme.git

Fix bug in DIRECTORY-READ: if the argument has any name component,
don't default other name components to 'WILD.
---

diff --git a/v7/src/runtime/unxdir.scm b/v7/src/runtime/unxdir.scm
index 0ab544065..3a3dd7171 100644
--- a/v7/src/runtime/unxdir.scm
+++ b/v7/src/runtime/unxdir.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/unxdir.scm,v 14.4 1989/08/04 02:14:09 cph Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/unxdir.scm,v 14.5 1991/07/17 08:54:53 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -44,9 +44,15 @@ MIT in each case. |#
 
 (define (directory-read-nosort pattern)
   (let ((pattern
-	 (pathname-default (pathname->absolute-pathname (->pathname pattern))
-			   false false false
-			   'WILD 'WILD 'WILD)))
+	 (let ((pattern (pathname->absolute-pathname (->pathname pattern))))
+	   (if (or (pathname-name pattern)
+		   (pathname-type pattern)
+		   (pathname-version pattern))
+	       pattern
+	       (make-pathname (pathname-host pathname)
+			      (pathname-device pathname)
+			      (pathname-directory pathname)
+			      'WILD 'WILD 'WILD)))))
     (let ((directory-path (pathname-directory-path pattern)))
       (let ((pathnames (generate-directory-pathnames directory-path)))
 	(cond ((and (eq? 'WILD (pathname-name pattern))