From: Camm Maguire <camm@debian.org>
Date: Wed, 18 Dec 2019 20:14:09 +0000 (+0000)
Subject: pathnames1.12
X-Git-Tag: archive/raspbian/2.6.12-91+rpi1^2~60
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3f94f8c925960507fc4dd84bb55574c66644d2ac;p=gcl.git

pathnames1.12


Gbp-Pq: Name pathnames1.12
---

diff --git a/lsp/gcl_iolib.lsp b/lsp/gcl_iolib.lsp
index 93a7d08b..60a18d99 100755
--- a/lsp/gcl_iolib.lsp
+++ b/lsp/gcl_iolib.lsp
@@ -457,11 +457,10 @@
 		      if-exists iesp if-does-not-exist idnesp external-format)))
     (when (typep s 'stream) (c-set-stream-object1 s pf) s)))
 
-(defun load-pathname-exists (z &aux (z (link-expand (namestring z))))
-  (cond ((eq (stat z) :file) z)
-	(*allow-gzipped-file*
-	 (when (eq (stat (string-concatenate (namestring z) ".gz")) :file)
-	  z))))
+(defun load-pathname-exists (z)
+  (or (probe-file z)
+      (when *allow-gzipped-file*
+	(probe-file (string-concatenate (namestring z) ".gz")))))
 
 (defun load-pathname (p print if-does-not-exist external-format
 			&aux (pp (merge-pathnames p))
diff --git a/lsp/gcl_listlib.lsp b/lsp/gcl_listlib.lsp
index 21ec2050..b93d2fec 100755
--- a/lsp/gcl_listlib.lsp
+++ b/lsp/gcl_listlib.lsp
@@ -123,8 +123,8 @@
 
 (defun smallnthcdr (n x)
   (declare (fixnum n))
-  (cond ((atom x) (when x (tp-error x proper-list)))
-	((= n 0) x)
+  (cond ((= n 0) x)
+	((atom x) (when x (tp-error x proper-list)))
 	((smallnthcdr (1- n) (cdr x)))))
 
 (defun bignthcdr (n i s f) 
diff --git a/lsp/gcl_truename.lsp b/lsp/gcl_truename.lsp
index e7a754ea..130f2e06 100644
--- a/lsp/gcl_truename.lsp
+++ b/lsp/gcl_truename.lsp
@@ -38,5 +38,5 @@
   (check-type pd pathname-designator)
   (when (wild-pathname-p pn)
     (error 'file-error :pathname pn :format-control "Pathname is wild"))
-  (when (eq (stat (namestring pn)) :file)
+  (when (eq (stat (link-expand (namestring pn))) :file)
     (truename pn)))