X-Git-Url: http://git.kpe.io/?p=vcs-tree.git;a=blobdiff_plain;f=kmrcl-excerpt.lisp;fp=kmrcl-excerpt.lisp;h=9a74e8cda31f8417a67cd539a01eff4c28c4622c;hp=b3a225a3f3330223571940d867f3addcf9717be1;hb=f3b2183bff9f8e1d3dfc13abd55593649eebf652;hpb=f5735efb18dce73c993427c75aa39478fa27cffa diff --git a/kmrcl-excerpt.lisp b/kmrcl-excerpt.lisp index b3a225a..9a74e8c 100644 --- a/kmrcl-excerpt.lisp +++ b/kmrcl-excerpt.lisp @@ -16,8 +16,8 @@ "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) + (let ((eof (gensym))) + (do ((line (read-line in nil eof) (read-line in nil eof))) ((eq line eof)) (push line lines))) @@ -80,7 +80,7 @@ new-dir) :name nil :type nil :version nil :defaults path) path)))) - + (defun probe-directory (filename) (let ((path (canonicalize-directory-name filename))) @@ -153,15 +153,15 @@ (defun shell-command-output (cmd &key directory whole) #+allegro (excl.osi:command-output cmd :directory directory :whole whole) #+sbcl - (let* ((out (make-array '(0) :element-type 'base-char :fill-pointer 0 + (let* ((out (make-array '(0) :element-type 'character :fill-pointer 0 :adjustable t)) - (err (make-array '(0) :element-type 'base-char :fill-pointer 0 + (err (make-array '(0) :element-type 'character :fill-pointer 0 :adjustable t)) - (status + (status (sb-impl::process-exit-code (with-output-to-string (out-stream out) (with-output-to-string (err-stream err) - (sb-ext:run-program + (sb-ext:run-program "/bin/sh" (list "-c" cmd) :input nil :output out-stream :error err-stream))))))