From e2500c14d266a9d19bf89d0fcb296de64c2e2f5c Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 7 Feb 2010 18:17:53 +1300 Subject: [PATCH] io.launcher.unix: sometimes both WIFEXITED and WIFSIGNALED would return true, and the wrong status would be reported --- basis/io/launcher/unix/unix-tests.factor | 4 ++-- basis/io/launcher/unix/unix.factor | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/basis/io/launcher/unix/unix-tests.factor b/basis/io/launcher/unix/unix-tests.factor index 4304f5f62a..bb7569516a 100644 --- a/basis/io/launcher/unix/unix-tests.factor +++ b/basis/io/launcher/unix/unix-tests.factor @@ -3,7 +3,7 @@ USING: io.files io.files.temp io.directories io.pathnames tools.test io.launcher arrays io namespaces continuations math io.encodings.binary io.encodings.ascii accessors kernel sequences io.encodings.utf8 destructors io.streams.duplex locals -concurrency.promises threads unix.process calendar ; +concurrency.promises threads unix.process calendar unix ; [ ] [ [ "launcher-test-1" temp-file delete-file ] ignore-errors @@ -134,7 +134,7 @@ concurrency.promises threads unix.process calendar ; [ p fulfill ] [ wait-for-process s fulfill ] bi ] in-thread - p 1 seconds ?promise-timeout handle>> 9 kill drop + p 1 seconds ?promise-timeout handle>> kill-process* s ?promise 0 = ] ] unit-test diff --git a/basis/io/launcher/unix/unix.factor b/basis/io/launcher/unix/unix.factor index 28c805a528..d8b55d3d17 100644 --- a/basis/io/launcher/unix/unix.factor +++ b/basis/io/launcher/unix/unix.factor @@ -91,7 +91,7 @@ M: unix kill-process* ( pid -- ) TUPLE: signal n ; : code>status ( code -- obj ) - dup WIFEXITED [ WEXITSTATUS ] [ WTERMSIG signal boa ] if ; + dup WIFSIGNALED [ WTERMSIG signal boa ] [ WEXITSTATUS ] if ; M: unix wait-for-processes ( -- ? ) 0 -1 over WNOHANG waitpid