sfos/ecl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

run-program: fix handling of nil argument to :if-output-exists, :if-input-does-not-exist

Browse source 
According to the documentation, we were supposed to return nil, but
instead we signaled a bogus error like

 :INPUT argument to RUN-PROGRAM does not have a file handle:
 #<output stream "/dev/null" 0x5645a22a5280>
This commit is contained in:
Marius Gerbershagen 2020-02-07 21:35:44 +01:00
parent f67d9a5b91
commit b85d628955
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/lsp/process.lsp
View file

@ -158,7 +158,20 @@
(open #-windows "/dev/null"
#+windows "nul"
:direction direction
:if-exists :overwrite)))
:if-exists :overwrite))
(verify-stream (stream stream-type)
(case stream
((nil)
(when (null (case stream-type
(:input if-input-does-not-exist)
(:output if-output-exists)
(:error if-error-exists)))
(return-from run-program nil))
(null-stream (if (eql stream-type :input)
:output
:input)))
(:virtual-stream :stream)
(otherwise stream))))
(let ((progname (si:copy-to-simple-base-string command))
(args (prepare-args (cons command argv)))
(process (make-external-process))
@ -177,18 +190,9 @@
(multiple-value-setq (pid parent-write parent-read parent-error)
(si:spawn-subprocess progname args environ
(case process-input
((nil) (null-stream :output))
(:virtual-stream :stream)
(otherwise process-input))
(case process-output
((nil) (null-stream :input))
(:virtual-stream :stream)
(otherwise process-output))
(case process-error
((nil) (null-stream :input))
(:virtual-stream :stream)
(otherwise process-error))))
(verify-stream process-input :input)
(verify-stream process-output :output)
(verify-stream process-error :error)))
(let ((stream-write
(when (plusp parent-write)