From ee61d0a9b84857e8a15ea981d8cb1cf956f6bb05 Mon Sep 17 00:00:00 2001 From: Elias Pipping <elias.pipping@fu-berlin.de> Date: Fri, 9 Sep 2016 19:52:11 +0000 Subject: [PATCH] Fix indentation Whitespace changes were intentionally left out of the previous commit to keep it readable. --- uiop/run-program.lisp | 56 +++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/uiop/run-program.lisp b/uiop/run-program.lisp index 3105520ce..3d99dcea5 100644 --- a/uiop/run-program.lisp +++ b/uiop/run-program.lisp @@ -740,34 +740,34 @@ It returns a process-info object." input :keys keys :stream-easy-p t :active (eq activity :input)) (setf process-info - (apply '%run-program command - :wait wait :input reduced-input :output reduced-output - :error-output (if (eq error-output :output) :output reduced-error-output) - keys)) - (labels ((get-stream (stream-name &optional fallbackp) - (or (slot-value process-info stream-name) - (when fallbackp - (slot-value process-info 'bidir-stream)))) - (run-activity (activity stream-name &optional fallbackp) - (if-let (stream (get-stream stream-name fallbackp)) - (funcall activity stream) - (error 'subprocess-error - :code `(:missing ,stream-name) - :command command :process process-info)))) - (unwind-protect - (ecase activity - ((nil)) - (:input (run-activity input-activity 'input-stream t)) - (:output (run-activity output-activity 'output-stream t)) - (:error-output (run-activity error-output-activity 'error-output-stream))) - (dolist (stream - (cons (slot-value process-info 'error-output-stream) - (if-let (bidir-stream (slot-value process-info 'bidir-stream)) - (list bidir-stream) - (list (slot-value process-info 'input-stream) - (slot-value process-info 'output-stream))))) - (when stream (close stream))) - (setf exit-code (%wait-process-result process-info))))))) + (apply '%run-program command + :wait wait :input reduced-input :output reduced-output + :error-output (if (eq error-output :output) :output reduced-error-output) + keys)) + (labels ((get-stream (stream-name &optional fallbackp) + (or (slot-value process-info stream-name) + (when fallbackp + (slot-value process-info 'bidir-stream)))) + (run-activity (activity stream-name &optional fallbackp) + (if-let (stream (get-stream stream-name fallbackp)) + (funcall activity stream) + (error 'subprocess-error + :code `(:missing ,stream-name) + :command command :process process-info)))) + (unwind-protect + (ecase activity + ((nil)) + (:input (run-activity input-activity 'input-stream t)) + (:output (run-activity output-activity 'output-stream t)) + (:error-output (run-activity error-output-activity 'error-output-stream))) + (dolist (stream + (cons (slot-value process-info 'error-output-stream) + (if-let (bidir-stream (slot-value process-info 'bidir-stream)) + (list bidir-stream) + (list (slot-value process-info 'input-stream) + (slot-value process-info 'output-stream))))) + (when stream (close stream))) + (setf exit-code (%wait-process-result process-info))))))) (%check-result exit-code :command command :process process-info :ignore-error-status ignore-error-status) -- GitLab