projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.48.15: fix null broadcast-streams as RUN-PROGRAM output streams
[sbcl.git]
/
src
/
code
/
run-program.lisp
diff --git
a/src/code/run-program.lisp
b/src/code/run-program.lisp
index
e85e2cc
..
0f31a0f
100644
(file)
--- a/
src/code/run-program.lisp
+++ b/
src/code/run-program.lisp
@@
-938,7
+938,9
@@
Users Manual for details about the PROCESS structure."#-win32"
(cond ((eq object t)
;; No new descriptor is needed.
(values -1 nil))
(cond ((eq object t)
;; No new descriptor is needed.
(values -1 nil))
- ((eq object nil)
+ ((or (eq object nil)
+ (and (typep object 'broadcast-stream)
+ (not (broadcast-stream-streams object))))
;; Use /dev/null.
(multiple-value-bind
(fd errno)
;; Use /dev/null.
(multiple-value-bind
(fd errno)
@@
-1051,7
+1053,10
@@
Users Manual for details about the PROCESS structure."#-win32"
(loop with buf = (make-array 256 :element-type '(unsigned-byte 8))
for p = (read-sequence buf object)
until (zerop p)
(loop with buf = (make-array 256 :element-type '(unsigned-byte 8))
for p = (read-sequence buf object)
until (zerop p)
- do (sb-unix:unix-write fd buf 0 p))))
+ do (sb-unix:unix-write fd buf 0 p)))
+ (t
+ (error "Don't know how to copy from stream of element-type ~S"
+ et)))
(sb-unix:unix-lseek fd 0 sb-unix:l_set)
(push fd *close-in-parent*)
(return (values fd nil)))))
(sb-unix:unix-lseek fd 0 sb-unix:l_set)
(push fd *close-in-parent*)
(return (values fd nil)))))