[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: new module 'sys_wait'
From: |
Bruno Haible |
Subject: |
Re: new module 'sys_wait' |
Date: |
Sun, 19 Oct 2008 23:29:35 +0200 |
User-agent: |
KMail/1.5.4 |
And with this patch, the 'wait-process' module makes use of the substituted
<sys/wait.h>.
2008-10-19 Bruno Haible <address@hidden>
* lib/wait-process.c: Include simply <sys/wait.h>.
(waitpid, WTERMSIG, WCOREDUMP, WEXITSTATUS, WIFSIGNALED, WIFEXITED,
WIFSTOPPED): Remove fallback definitions.
* modules/wait-process (Depends-on): Add sys_wait.
--- lib/wait-process.c.orig 2008-10-19 23:26:44.000000000 +0200
+++ lib/wait-process.c 2008-10-19 22:02:49.000000000 +0200
@@ -27,50 +27,7 @@
#include <signal.h>
#include <sys/types.h>
-
-#if defined _MSC_VER || defined __MINGW32__
-
-/* Native Woe32 API. */
-#include <process.h>
-#define waitpid(pid,statusp,options) _cwait (statusp, pid, WAIT_CHILD)
-#define WTERMSIG(x) ((x) & 0xff) /* or: SIGABRT ?? */
-#define WCOREDUMP(x) 0
-#define WEXITSTATUS(x) (((x) >> 8) & 0xff) /* or: (x) ?? */
-#define WIFSIGNALED(x) (WTERMSIG (x) != 0) /* or: ((x) == 3) ?? */
-#define WIFEXITED(x) (WTERMSIG (x) == 0) /* or: ((x) != 3) ?? */
-#define WIFSTOPPED(x) 0
-
-#else
-
-/* Unix API. */
#include <sys/wait.h>
-/* On Linux, WEXITSTATUS are bits 15..8 and WTERMSIG are bits 7..0, while
- BeOS uses the contrary. Therefore we use the abstract macros. */
-#ifndef WTERMSIG
-# define WTERMSIG(x) ((x) & 0x7f)
-#endif
-#ifndef WCOREDUMP
-# define WCOREDUMP(x) ((x) & 0x80)
-#endif
-#ifndef WEXITSTATUS
-# define WEXITSTATUS(x) (((x) >> 8) & 0xff)
-#endif
-/* For valid x, exactly one of WIFSIGNALED(x), WIFEXITED(x), WIFSTOPPED(x)
- is true. */
-#ifndef WIFSIGNALED
-# define WIFSIGNALED(x) (WTERMSIG (x) != 0 && WTERMSIG(x) != 0x7f)
-#endif
-#ifndef WIFEXITED
-# define WIFEXITED(x) (WTERMSIG (x) == 0)
-#endif
-#ifndef WIFSTOPPED
-# define WIFSTOPPED(x) (WTERMSIG (x) == 0x7f)
-#endif
-/* Note that portable applications may access
- WTERMSIG(x) only if WIFSIGNALED(x) is true, and
- WEXITSTATUS(x) only if WIFEXITED(x) is true. */
-
-#endif
#include "error.h"
#include "fatal-signal.h"
--- modules/wait-process.orig 2008-10-19 23:26:44.000000000 +0200
+++ modules/wait-process 2008-10-19 22:03:10.000000000 +0200
@@ -14,6 +14,7 @@
xalloc
gettext-h
stdbool
+sys_wait
unistd
configure.ac: