diff options
author | Mike Buland <eichlan@xagasoft.com> | 2010-06-18 19:49:31 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2010-06-18 19:49:31 +0000 |
commit | 7cd3655e2e3edc630b21e495438c4b324c50c759 (patch) | |
tree | 53de1076fc4b2099d421e33b399c24601b0e6540 /src/functionexecute.cpp | |
parent | e6d580738288c85a7eb50182aed4e7dba49d32f2 (diff) | |
download | build-7cd3655e2e3edc630b21e495438c4b324c50c759.tar.gz build-7cd3655e2e3edc630b21e495438c4b324c50c759.tar.bz2 build-7cd3655e2e3edc630b21e495438c4b324c50c759.tar.xz build-7cd3655e2e3edc630b21e495438c4b324c50c759.zip |
Fixed some things that broke when Process changed it's functionality slightly.
Diffstat (limited to '')
-rw-r--r-- | src/functionexecute.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/functionexecute.cpp b/src/functionexecute.cpp index f692036..0b0aabf 100644 --- a/src/functionexecute.cpp +++ b/src/functionexecute.cpp | |||
@@ -31,7 +31,7 @@ Variable FunctionExecute::call( Variable &/*input*/, VarList lParams ) | |||
31 | Process pCmd( Process::Both, "/bin/bash", "/bin/bash", "-c", | 31 | Process pCmd( Process::Both, "/bin/bash", "/bin/bash", "-c", |
32 | lParams.first().getString().getStr(), NULL ); | 32 | lParams.first().getString().getStr(), NULL ); |
33 | FString sStdOut, sStdErr; | 33 | FString sStdOut, sStdErr; |
34 | while( pCmd.isRunning() ) | 34 | do |
35 | { | 35 | { |
36 | char buf[4096]; | 36 | char buf[4096]; |
37 | bool out, err; | 37 | bool out, err; |
@@ -49,6 +49,7 @@ Variable FunctionExecute::call( Variable &/*input*/, VarList lParams ) | |||
49 | //sio << "Read " << iRead << " bytes of stdout." << sio.nl; | 49 | //sio << "Read " << iRead << " bytes of stdout." << sio.nl; |
50 | } | 50 | } |
51 | } | 51 | } |
52 | while( pCmd.isRunning() ); | ||
52 | 53 | ||
53 | pContext->getView()->cmdFinished( | 54 | pContext->getView()->cmdFinished( |
54 | sStdOut, sStdErr, pCmd.childExitStatus() | 55 | sStdOut, sStdErr, pCmd.childExitStatus() |