X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=io.lisp;h=8f38e0e6ca5fac9c9c016528d90b4a41990a5b72;hp=ba68048739c57e4ff55b4138d8e48e6308af95cc;hb=22765cd49d01672b58873f98554c3b5f3069663f;hpb=1b7f506ec98bd5b885203a3250c52603b943cee9

diff --git a/io.lisp b/io.lisp
index ba68048..8f38e0e 100644
--- a/io.lisp
+++ b/io.lisp
@@ -39,9 +39,19 @@
 	
 (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)
-      (read-stream-to-string in))))
+  (with-open-file (in file :direction :input)
+    (read-stream-to-string in)))
+
+(defun read-file-to-usb8-array (file)
+  "Opens a reads a file. Returns the contents as single unsigned-byte array"
+  (with-open-file (in file :direction :input :element-type '(unsigned-byte 8))
+    (let* ((file-len (file-length in))
+	   (usb8 (make-array file-len :element-type '(unsigned-byte 8)))
+	   (pos (read-sequence usb8 in)))
+      (unless (= file-len pos)
+	(error "Length read (~D) doesn't match file length (~D)~%" pos file-len))
+      usb8)))
+      
 
 (defun read-stream-to-strings (in)
   (let ((lines '())
@@ -311,8 +321,8 @@
     (write-char #\: stream)
     (write-string (aref +datetime-number-strings+ minute) stream)))
 
-(defun copy-binary-stream (in out)
-  (do* ((buf (make-array 4096 :element-type '(unsigned-byte 8)))
+(defun copy-binary-stream (in out &key (chunk-size 16384))
+  (do* ((buf (make-array chunk-size :element-type '(unsigned-byte 8)))
 	(pos (read-sequence buf in) (read-sequence buf in)))
       ((zerop pos))
     (write-sequence buf out :end pos)))