andrius
/
gash
mirror of https://git.savannah.gnu.org/git/gash.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix spawn to use no input or just the first

This commit is contained in:
Rutger van Beusekom 2018-07-01 14:04:23 +02:00
parent 1b56f8cb2f
commit e3d564fc4c
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gash/pipe.scm
View File

@ -56,17 +56,14 @@
(map close outputs)))
(define* (spawn fg? job command #:optional (input '()))
;;(format #t "spawn: ~a\n" (length input))
(let* ((ofd '(1 2)) ;; output file descriptors 1, ...
(let* ((ofd '(1 2)) ;; output file descriptors 1 & 2
(ifd (cond
((= (length input) 0) '())
((= (length input) 1) '(0))))
((null? input) '())
(#t '(0)))) ;;support no input or 1 input, TODO multiple inputs
(pipes (map (lambda (. _) (pipe)) ofd))
(r (map car pipes))
(w (map cdr pipes))
(pid (primitive-fork)))
;;(format (current-error-port) "INPUT: ~a\n" (length input))
;;(format (current-error-port) "OUTPUT: ~a\n" (length w))
(cond ((= 0 pid)
(job-setup-process fg? job)
(map close r)
@ -78,8 +75,6 @@
(when (pair? w)
(close-port (current-output-port))
(set-current-output-port (car w)))
;;(format (current-error-port) "INPUT: ~a\n" (length input))
;;(format (current-error-port) "OUTPUT: ~a\n" (length w))
(if (thunk? command) (command)
(command input w))
(exit 0))