X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=os.lisp;h=cce2a2f99fe80f7b221487d08d01ad1f2a20a3c1;hp=0861b07b8418ed1f5bb81e25b21dd899f8bc86f9;hb=e96b017d2a09ffd9c9279cb4c2341c53f0581022;hpb=19190787da0e49afad011b90b4b6ce8608b22444

diff --git a/os.lisp b/os.lisp
index 0861b07..cce2a2f 100644
--- a/os.lisp
+++ b/os.lisp
@@ -60,7 +60,8 @@ returns (VALUES string-output error-output exit-status)"
 	  (let ((status 
 		 (system:call-system-showing-output
 		  command
-		  :shell-type "/bin/sh"
+		  :prefix ""
+		  :show-cmd nil
 		  :output-stream output)))
 	    (values (get-output-stream-string output) nil status))
 	(close output)))
@@ -119,7 +120,9 @@ returns (VALUES output-string pid)"
     (system:call-system-showing-output
      command
      :shell-type "/bin/sh"
-     :output-stream output)
+     :show-cmd nil
+     :prefix ""
+     :output-stream nil)
     
     #+clisp		;XXX not exactly *verbose-out*, I know
     (ext:run-shell-command  command :output :terminal :wait t)
@@ -136,7 +139,23 @@ returns (VALUES output-string pid)"
 
     ))
 
-(defun delete-directory-and-files (dir)
-  #+allegro (excl:delete-directory-and-files dir)
-  #-(or allegro) (warn "delete-directory-and-files not implemented for this platform.")
-  )
+(defun delete-directory-and-files (dir &key (if-does-not-exist :error) (quiet t) force)
+  #+allegro (excl:delete-directory-and-files dir :if-does-not-exist if-does-not-exist
+					     :quiet quiet :force force)
+  #-(or allegro) (declare (ignore force))
+  #-(or allegro) (cond
+		   ((probe-directory dir)
+		    (let ((cmd (format nil "rm -rf ~A" (namestring dir))))
+		      (unless quiet
+			(format *trace-output* ";; ~A" cmd))
+		      (command-output cmd)))
+		   ((eq if-does-not-exist :error)
+		    (error "Directory ~A does not exist [delete-directory-and-files]." dir))))
+
+(defun file-size (file)
+  (when (probe-file file)
+    #+allegro (let ((stat (excl.osi:stat (namestring file))))
+		(excl.osi:stat-size stat))
+    #-allegro
+    (with-open-file (in file :direction :input)
+      (file-length in))))