diff options
author | Amrykid <amrykid@gmail.com> | 2011-12-27 09:34:45 -0600 |
---|---|---|
committer | Amrykid <amrykid@gmail.com> | 2011-12-27 09:49:47 -0600 |
commit | f0f904ac70abec7bbab2c00075c9c4148a9b5132 (patch) | |
tree | c753ffe98edfb5271fa3fdd8cb28c249e1d78a00 /lib/pure/osproc.nim | |
parent | e978272d3c8da588292af8b7a95eb8ea03befbf4 (diff) | |
download | Nim-f0f904ac70abec7bbab2c00075c9c4148a9b5132.tar.gz |
Documentation comments + slight code modifications to zipfiles.nim.
Changes made to osproc.nim so it will compile.
Diffstat (limited to 'lib/pure/osproc.nim')
-rwxr-xr-x | lib/pure/osproc.nim | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/pure/osproc.nim b/lib/pure/osproc.nim index 99c128e4d..510dff232 100755 --- a/lib/pure/osproc.nim +++ b/lib/pure/osproc.nim @@ -102,7 +102,7 @@ proc processID*(p: PProcess): int {.rtl, extern: "nosp$1".} = ## returns `p`'s process ID. return p.id -proc waitForExit*(p: PProcess): int {.rtl, extern: "nosp$1".} +proc waitForExit*(p: PProcess, timeout: int = -1): int {.rtl, extern: "nosp$1".} ## waits for the process to finish and returns `p`'s error code. proc peekExitCode*(p: PProcess): int @@ -383,9 +383,7 @@ when defined(Windows) and not defined(useNimRtl): discard TerminateProcess(p.FProcessHandle, 0) proc waitForExit(p: PProcess, timeout: int = -1): int = - if timeout is -1: - discard WaitForSingleObject(p.FProcessHandle, Infinite) - else: discard WaitForSingleObject(p.FProcessHandle, timeout) + discard WaitForSingleObject(p.FProcessHandle, timeout) var res: int32 discard GetExitCodeProcess(p.FProcessHandle, res) @@ -643,7 +641,7 @@ elif not defined(useNimRtl): if kill(-p.id, SIGKILL) != 0'i32: OSError() else: OSError() - proc waitForExit(p: PProcess): int = + proc waitForExit(p: PProcess, timeout: int = -1): int = #if waitPid(p.id, p.exitCode, 0) == int(p.id): # ``waitPid`` fails if the process is not running anymore. But then # ``running`` probably set ``p.exitCode`` for us. Since ``p.exitCode`` is |