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

cmp: quote arguments when invoking C compiler

Browse source 
Now we can compile files with spaces in their paths on windows.
This commit is contained in:
Marius Gerbershagen 2020-01-26 21:31:14 +01:00
parent eadefe86ed
commit c8003c2fc4
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/cmp/cmpos-run.lsp
View file

@ -50,19 +50,26 @@
(args `(,@(cdr program) ,@args))
(program (car program)))
(with-current-directory
#-windows (multiple-value-bind (output-stream return-status pid)
(si:run-program-inner program args :default nil)
(setf output (collect-lines output-stream))
(multiple-value-setq (return-status result)
(si:waitpid pid t)))
#+windows (setf result (si:system (format nil "~A~{ ~A~}" program args)))))
;; when compiling ECL itself, we only have low-level functions
;; available, otherwise we can use run-program and get proper
;; quoting of arguments
#+ecl-min (multiple-value-bind (output-stream return-status pid)
(si:run-program-inner program args :default nil)
(setf output (collect-lines output-stream))
(multiple-value-setq (return-status result)
(si:waitpid pid t)))
#-ecl-min (multiple-value-bind (output-stream return-status process-obj)
(ext:run-program program args :wait nil)
(setf output (collect-lines output-stream))
(multiple-value-setq (return-status result)
(ext:external-process-wait process-obj t)))))
(cond ((null result)
(cerror "Continues anyway."
"Unable to execute:~%(SI:RUN-PROGRAM-INNER ~S ~S NIL)"
"Unable to execute:~%(EXT:RUN-PROGRAM ~S ~S)"
program args result))
((not (zerop result))
(cerror "Continues anyway."
"Error code ~D when executing~%(SI:RUN-PROGRAM-INNER ~S ~S NIL):~%~{~A~^~%~}"
"Error code ~D when executing~%(EXT:RUN-PROGRAM ~S ~S):~%~{~A~^~%~}"
result program args output)))
result)