From cb7967b40d4a9b6e17003b8518c7cd49d29108ab Mon Sep 17 00:00:00 2001 From: Jakob Kaivo Date: Wed, 31 Jan 2024 16:46:49 -0500 Subject: purge last of posix-specific headers --- src/sys/wait/P_ALL.h | 1 - src/sys/wait/P_PGID.h | 1 - src/sys/wait/P_PID.h | 1 - src/sys/wait/WCONTINUED.h | 6 ------ src/sys/wait/WEXITED.h | 6 ------ src/sys/wait/WEXITSTATUS.h | 5 ----- src/sys/wait/WIFCONTINUED.h | 5 ----- src/sys/wait/WIFEXITED.h | 5 ----- src/sys/wait/WIFSIGNALED.h | 5 ----- src/sys/wait/WIFSTOPPED.h | 5 ----- src/sys/wait/WNOHANG.h | 5 ----- src/sys/wait/WNOWAIT.h | 6 ------ src/sys/wait/WSTOPPED.h | 6 ------ src/sys/wait/WSTOPSIG.h | 5 ----- src/sys/wait/WTERMSIG.h | 5 ----- src/sys/wait/WUNTRACED.h | 5 ----- src/sys/wait/id_t.ref | 3 --- src/sys/wait/idtype_t.h | 10 ---------- src/sys/wait/pid_t.ref | 3 --- src/sys/wait/siginfo_t.ref | 3 --- src/sys/wait/struct_rusage.ref | 3 --- src/sys/wait/wait.c | 10 ---------- src/sys/wait/wait3.c | 21 -------------------- src/sys/wait/waitid.c | 13 ------------ src/sys/wait/waitpid.c | 45 ------------------------------------------ 25 files changed, 183 deletions(-) delete mode 100644 src/sys/wait/P_ALL.h delete mode 100644 src/sys/wait/P_PGID.h delete mode 100644 src/sys/wait/P_PID.h delete mode 100644 src/sys/wait/WCONTINUED.h delete mode 100644 src/sys/wait/WEXITED.h delete mode 100644 src/sys/wait/WEXITSTATUS.h delete mode 100644 src/sys/wait/WIFCONTINUED.h delete mode 100644 src/sys/wait/WIFEXITED.h delete mode 100644 src/sys/wait/WIFSIGNALED.h delete mode 100644 src/sys/wait/WIFSTOPPED.h delete mode 100644 src/sys/wait/WNOHANG.h delete mode 100644 src/sys/wait/WNOWAIT.h delete mode 100644 src/sys/wait/WSTOPPED.h delete mode 100644 src/sys/wait/WSTOPSIG.h delete mode 100644 src/sys/wait/WTERMSIG.h delete mode 100644 src/sys/wait/WUNTRACED.h delete mode 100644 src/sys/wait/id_t.ref delete mode 100644 src/sys/wait/idtype_t.h delete mode 100644 src/sys/wait/pid_t.ref delete mode 100644 src/sys/wait/siginfo_t.ref delete mode 100644 src/sys/wait/struct_rusage.ref delete mode 100644 src/sys/wait/wait.c delete mode 100644 src/sys/wait/wait3.c delete mode 100644 src/sys/wait/waitid.c delete mode 100644 src/sys/wait/waitpid.c (limited to 'src/sys/wait') diff --git a/src/sys/wait/P_ALL.h b/src/sys/wait/P_ALL.h deleted file mode 100644 index 03a16c68..00000000 --- a/src/sys/wait/P_ALL.h +++ /dev/null @@ -1 +0,0 @@ -#define P_ALL 0 diff --git a/src/sys/wait/P_PGID.h b/src/sys/wait/P_PGID.h deleted file mode 100644 index e996d78a..00000000 --- a/src/sys/wait/P_PGID.h +++ /dev/null @@ -1 +0,0 @@ -#define P_PGID 2 diff --git a/src/sys/wait/P_PID.h b/src/sys/wait/P_PID.h deleted file mode 100644 index 737761bb..00000000 --- a/src/sys/wait/P_PID.h +++ /dev/null @@ -1 +0,0 @@ -#define P_PID 1 diff --git a/src/sys/wait/WCONTINUED.h b/src/sys/wait/WCONTINUED.h deleted file mode 100644 index a0a2d2d9..00000000 --- a/src/sys/wait/WCONTINUED.h +++ /dev/null @@ -1,6 +0,0 @@ -#include -#define WCONTINUED (1<<2) - -/* -XOPEN(400) -*/ diff --git a/src/sys/wait/WEXITED.h b/src/sys/wait/WEXITED.h deleted file mode 100644 index 1dfb7f42..00000000 --- a/src/sys/wait/WEXITED.h +++ /dev/null @@ -1,6 +0,0 @@ -#include -#define WEXITED (1<<3) -/* -XOPEN(400) -POSIX(200809) -*/ diff --git a/src/sys/wait/WEXITSTATUS.h b/src/sys/wait/WEXITSTATUS.h deleted file mode 100644 index 4256e805..00000000 --- a/src/sys/wait/WEXITSTATUS.h +++ /dev/null @@ -1,5 +0,0 @@ -#include -#define WEXITSTATUS(__stat_val) (__stat_val & 0xff) -/* -POSIX(1) -*/ diff --git a/src/sys/wait/WIFCONTINUED.h b/src/sys/wait/WIFCONTINUED.h deleted file mode 100644 index 4fa2f892..00000000 --- a/src/sys/wait/WIFCONTINUED.h +++ /dev/null @@ -1,5 +0,0 @@ -#include -#define WIFCONTINUED(__stat_val) (__stat_val & 0x400) -/* -XOPEN(400) -*/ diff --git a/src/sys/wait/WIFEXITED.h b/src/sys/wait/WIFEXITED.h deleted file mode 100644 index ffaa6515..00000000 --- a/src/sys/wait/WIFEXITED.h +++ /dev/null @@ -1,5 +0,0 @@ -#include -#define WIFEXITED(__stat_val) (__stat_val <= 255) -/* -POSIX(1) -*/ diff --git a/src/sys/wait/WIFSIGNALED.h b/src/sys/wait/WIFSIGNALED.h deleted file mode 100644 index 4c3305b9..00000000 --- a/src/sys/wait/WIFSIGNALED.h +++ /dev/null @@ -1,5 +0,0 @@ -#include -#define WIFSIGNALED(__stat_val) (__stat_val & 0x100) -/* -POSIX(1) -*/ diff --git a/src/sys/wait/WIFSTOPPED.h b/src/sys/wait/WIFSTOPPED.h deleted file mode 100644 index 860c9520..00000000 --- a/src/sys/wait/WIFSTOPPED.h +++ /dev/null @@ -1,5 +0,0 @@ -#include -#define WIFSTOPPED(__stat_val) (__stat_val & 0x200) -/* -POSIX(1) -*/ diff --git a/src/sys/wait/WNOHANG.h b/src/sys/wait/WNOHANG.h deleted file mode 100644 index e5d24eac..00000000 --- a/src/sys/wait/WNOHANG.h +++ /dev/null @@ -1,5 +0,0 @@ -#include -#define WNOHANG (1<<0) -/* -POSIX(1) -*/ diff --git a/src/sys/wait/WNOWAIT.h b/src/sys/wait/WNOWAIT.h deleted file mode 100644 index 25f94a24..00000000 --- a/src/sys/wait/WNOWAIT.h +++ /dev/null @@ -1,6 +0,0 @@ -#include -#define WNOWAIT (1<<4) -/* -XOPEN(400) -POSIX(200809) -*/ diff --git a/src/sys/wait/WSTOPPED.h b/src/sys/wait/WSTOPPED.h deleted file mode 100644 index 41121d3a..00000000 --- a/src/sys/wait/WSTOPPED.h +++ /dev/null @@ -1,6 +0,0 @@ -#include -#define WSTOPPED (1<<5) -/* -XOPEN(400) -POSIX(200809) -*/ diff --git a/src/sys/wait/WSTOPSIG.h b/src/sys/wait/WSTOPSIG.h deleted file mode 100644 index 467729e4..00000000 --- a/src/sys/wait/WSTOPSIG.h +++ /dev/null @@ -1,5 +0,0 @@ -#include -#define WSTOPSIG(__stat_val) (__stat_val & 0xff) -/* -POSIX(1) -*/ diff --git a/src/sys/wait/WTERMSIG.h b/src/sys/wait/WTERMSIG.h deleted file mode 100644 index d3990ec7..00000000 --- a/src/sys/wait/WTERMSIG.h +++ /dev/null @@ -1,5 +0,0 @@ -#include -#define WTERMSIG(__stat_val) (__stat_val & 0xff) -/* -POSIX(1) -*/ diff --git a/src/sys/wait/WUNTRACED.h b/src/sys/wait/WUNTRACED.h deleted file mode 100644 index f8ef4ae2..00000000 --- a/src/sys/wait/WUNTRACED.h +++ /dev/null @@ -1,5 +0,0 @@ -#include -#define WUNTRACED (1<<1) -/* -POSIX(1) -*/ diff --git a/src/sys/wait/id_t.ref b/src/sys/wait/id_t.ref deleted file mode 100644 index ee53b956..00000000 --- a/src/sys/wait/id_t.ref +++ /dev/null @@ -1,3 +0,0 @@ -#include -REFERENCE(sys/types/id_t.c) -XOPEN(400) diff --git a/src/sys/wait/idtype_t.h b/src/sys/wait/idtype_t.h deleted file mode 100644 index 194325b6..00000000 --- a/src/sys/wait/idtype_t.h +++ /dev/null @@ -1,10 +0,0 @@ -#include -typedef enum { - P_ALL, - P_PGID, - P_PID -} idtype_t; -/* -XOPEN(400) -POSIX(200809) -*/ diff --git a/src/sys/wait/pid_t.ref b/src/sys/wait/pid_t.ref deleted file mode 100644 index 8747814d..00000000 --- a/src/sys/wait/pid_t.ref +++ /dev/null @@ -1,3 +0,0 @@ -#include -REFERENCE(sys/types/pid_t.c) -XOPEN(400) diff --git a/src/sys/wait/siginfo_t.ref b/src/sys/wait/siginfo_t.ref deleted file mode 100644 index 1083e5b8..00000000 --- a/src/sys/wait/siginfo_t.ref +++ /dev/null @@ -1,3 +0,0 @@ -#include -REFERENCE(signal/siginfo_t.c) -XOPEN(400) diff --git a/src/sys/wait/struct_rusage.ref b/src/sys/wait/struct_rusage.ref deleted file mode 100644 index da177e72..00000000 --- a/src/sys/wait/struct_rusage.ref +++ /dev/null @@ -1,3 +0,0 @@ -#include -REFERENCE(sys/resource/struct_rusage.c) -XOPEN(400) diff --git a/src/sys/wait/wait.c b/src/sys/wait/wait.c deleted file mode 100644 index ab7b5a72..00000000 --- a/src/sys/wait/wait.c +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include - -pid_t wait(int *stat_loc) -{ - return waitpid((pid_t)-1, stat_loc, 0); -} -/* -POSIX(1) -*/ diff --git a/src/sys/wait/wait3.c b/src/sys/wait/wait3.c deleted file mode 100644 index d64c1c28..00000000 --- a/src/sys/wait/wait3.c +++ /dev/null @@ -1,21 +0,0 @@ -#include -#include -#include - -pid_t wait3(int *stat_loc, int options, struct rusage *resource_usage) -{ - pid_t ret = waitpid((pid_t)-1, stat_loc, options); - if (ret == (pid_t)-1) { - return (pid_t)-1; - } - - if (getrusage(RUSAGE_CHILDREN, resource_usage) == -1) { - return (pid_t)-1; - } - - return ret; -} - -/* -XOPEN(400,600) -*/ diff --git a/src/sys/wait/waitid.c b/src/sys/wait/waitid.c deleted file mode 100644 index 875aa6d7..00000000 --- a/src/sys/wait/waitid.c +++ /dev/null @@ -1,13 +0,0 @@ -#include -#include -#include "_syscall.h" - -int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options) -{ - SYSCALL(waitid, int, -1, idtype, id, infop, option, NULL, 0); -} - -/* -XOPEN(400) -POSIX(200809) -*/ diff --git a/src/sys/wait/waitpid.c b/src/sys/wait/waitpid.c deleted file mode 100644 index 001cc2f6..00000000 --- a/src/sys/wait/waitpid.c +++ /dev/null @@ -1,45 +0,0 @@ -#include -#include -#include -#include -#include "_syscall.h" - -#ifndef P_PID -#include "signal/union_sigval.h" -#include "signal/siginfo_t.h" -#include "idtype_t.h" -#include "P_PID.h" -#include "P_PGID.h" -#include "P_ALL.h" -#define getpgid(_pid) __syscall(__syscall_lookup(getpgid), _pid, 0, 0, 0, 0, 0) -#define waitid(_type, _id, _si, _opt) __syscall(__syscall_lookup(waitid), _type, _id, _si, _opt, 0, 0) -#endif - -pid_t waitpid(pid_t pid, int *stat_loc, int options) -{ - /* TODO: handle WUNTRACED, is not recognized by waitid() */ - - siginfo_t si = { 0 }; - idtype_t idt = P_PID; - int ret = -1; - - if (pid == (pid_t)-1) { - idt = P_ALL; - } else if (pid == 0) { - idt = P_PGID; - pid = getpgid(0); - } else if (pid < (pid_t)-1) { - idt = P_PGID; - pid = -pid; - } - - ret = waitid(idt, pid, &si, options); - if (stat_loc) { - *stat_loc = si.si_status; - } - return ret; -} - -/* -POSIX(1) -*/ -- cgit v1.2.1