Documentation comments + slight code modifications to zipfiles.nim.
Changes made to osproc.nim so it will compile.
This commit is contained in:
parent
e978272d3c
commit
f0f904ac70
2 changed files with 7 additions and 6 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue