X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=io.lisp;h=6df15953c7b533c32a320a612c4b6481137a0a25;hp=7fbf186753e9f2ba731357bf66bdf60e0cd448c1;hb=969fdba72abb830cd8fff86cc77c21b4a7da3620;hpb=d11d6cc43fd9227a8aeed28dc2cfecdbc587ec4a

diff --git a/io.lisp b/io.lisp
index 7fbf186..6df1595 100644
--- a/io.lisp
+++ b/io.lisp
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; $Id$
 ;;;;
-;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of KMRCL, is Copyright (c) 2002-2003 by Kevin M. Rosenberg
 ;;;;
 ;;;; KMRCL users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
@@ -21,33 +21,41 @@
 (defun print-file-contents (file &optional (strm *standard-output*))
   "Opens a reads a file. Returns the contents as a single string"
   (when (probe-file file)
-    (with-open-file (in file :direction :input)
-      (let ((eof (gensym)))		    
-	(do ((line (read-line in nil eof) 
-		   (read-line in nil eof)))
-	    ((eq line eof))
-	  (format strm "~A~%" line))))))
-
+    (let ((eof (cons 'eof nil)))
+      (with-open-file (in file :direction :input)
+        (do ((line (read-line in nil eof) 
+                   (read-line in nil eof)))
+            ((eq line eof))
+          (write-string line strm)
+          (write-char #\newline strm))))))
+
+(defun read-stream-to-string (in)
+  (with-output-to-string (out)
+    (let ((eof (gensym)))		    
+      (do ((line (read-line in nil eof) 
+		 (read-line in nil eof)))
+	  ((eq line eof))
+	(format out "~A~%" line)))))
+	
 (defun read-file-to-string (file)
   "Opens a reads a file. Returns the contents as a single string"
   (with-output-to-string (out)
     (with-open-file (in file :direction :input)
-      (let ((eof (gensym)))		    
-	(do ((line (read-line in nil eof) 
-		   (read-line in nil eof)))
-	    ((eq line eof))
-	  (format out "~A~%" line))))))
-
+      (read-stream-to-string in))))
+
+(defun read-stream-to-strings (in)
+  (let ((lines '())
+	(eof (gensym)))		    
+    (do ((line (read-line in nil eof) 
+	       (read-line in nil eof)))
+	((eq line eof))
+      (push line lines)))
+  (nreverse lines))
+    
 (defun read-file-to-strings (file)
   "Opens a reads a file. Returns the contents as a list of strings"
-  (let ((lines '()))
-    (with-open-file (in file :direction :input)
-      (let ((eof (gensym)))		    
-	(do ((line (read-line in nil eof) 
-		   (read-line in nil eof)))
-	    ((eq line eof))
-	  (push line lines)))
-      (nreverse lines))))
+  (with-open-file (in file :direction :input)
+    (read-stream-to-strings in)))
 
 (defun file-subst (old new file1 file2)
   (with-open-file (in file1 :direction :input)
@@ -190,3 +198,25 @@
   (when (probe-file #p"/dev/null")
     (open-device-stream #p"/dev/null" :output))  
   )
+
+
+(defun directory-tree (filename)
+  "Returns a tree of pathnames for sub-directories of a directory"
+  (let* ((root (canonicalize-directory-name filename))
+	 (subdirs (loop for path in (directory
+				     (make-pathname :name :wild
+						    :type :wild
+						    :defaults root))
+			when (probe-directory path)
+			collect (canonicalize-directory-name path))))
+    (when (find nil subdirs)
+      (error "~A" subdirs))
+    (when (null root)
+      (error "~A" root))
+    (if subdirs
+	(cons root (mapcar #'directory-tree subdirs))
+	(if (probe-directory root)
+	    (list root)
+	    (error "root not directory ~A" root)))))
+
+