Commit a62c3982 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

launch-program: Remove % prefix for some variables

These variables are normalized versions of the launch-program arguments;
the normalized bindings fully shadow the user-provided values.
parent dad43553
...@@ -533,10 +533,10 @@ LAUNCH-PROGRAM returns a PROCESS-INFO object." ...@@ -533,10 +533,10 @@ LAUNCH-PROGRAM returns a PROCESS-INFO object."
(%handle-if-exists output if-output-exists) (%handle-if-exists output if-output-exists)
(%handle-if-exists error-output if-error-output-exists) (%handle-if-exists error-output if-error-output-exists)
#+(or abcl allegro clozure cmucl ecl (and lispworks os-unix) mkcl sbcl scl) #+(or abcl allegro clozure cmucl ecl (and lispworks os-unix) mkcl sbcl scl)
(let* ((%command (%normalize-command command)) (let* ((command (%normalize-command command))
(%input (%normalize-io-specifier input :input)) (input (%normalize-io-specifier input :input))
(%output (%normalize-io-specifier output :output)) (output (%normalize-io-specifier output :output))
(%error-output (%normalize-io-specifier error-output :error-output)) (error-output (%normalize-io-specifier error-output :error-output))
#+(and allegro os-windows) #+(and allegro os-windows)
(interactive (%interactivep input output error-output)) (interactive (%interactivep input output error-output))
(process* (process*
...@@ -546,18 +546,18 @@ LAUNCH-PROGRAM returns a PROCESS-INFO object." ...@@ -546,18 +546,18 @@ LAUNCH-PROGRAM returns a PROCESS-INFO object."
(apply (apply
#+abcl #'sys:run-program #+abcl #'sys:run-program
#+allegro 'excl:run-shell-command #+allegro 'excl:run-shell-command
#+(and allegro os-unix) (coerce (cons (first %command) %command) 'vector) #+(and allegro os-unix) (coerce (cons (first command) command) 'vector)
#+(and allegro os-windows) %command #+(and allegro os-windows) command
#+clozure 'ccl:run-program #+clozure 'ccl:run-program
#+(or cmucl ecl scl) 'ext:run-program #+(or cmucl ecl scl) 'ext:run-program
#+lispworks 'system:run-shell-command #+lispworks 'system:run-shell-command
#+lispworks (cons "/usr/bin/env" %command) ; LW wants a full path #+lispworks (cons "/usr/bin/env" command) ; LW wants a full path
#+mkcl 'mk-ext:run-program #+mkcl 'mk-ext:run-program
#+sbcl 'sb-ext:run-program #+sbcl 'sb-ext:run-program
(append (append
#+(or abcl clozure cmucl ecl mkcl sbcl scl) `(,(car %command) ,(cdr %command)) #+(or abcl clozure cmucl ecl mkcl sbcl scl) `(,(car command) ,(cdr command))
`(:input ,%input :output ,%output `(:input ,input :output ,output
#.(or #+(or allegro lispworks) :error-output :error) ,%error-output #.(or #+(or allegro lispworks) :error-output :error) ,error-output
:wait nil :element-type ,element-type :external-format ,external-format :wait nil :element-type ,element-type :external-format ,external-format
:if-input-does-not-exist :error :if-input-does-not-exist :error
:if-output-exists :append :if-output-exists :append
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment