[PATCH v2] tools/nolibc: Use linux/wait.h rather than duplicating it

[PATCH v2] tools/nolibc: Use linux/wait.h rather than duplicating it

[Mark Brown]

Linux defines a few custom flags for waitpid() which aren't currently
provided by nolibc, make them available to nolibc based programs by just
including linux/wait.h where they are defined instead of defining our
own copy of the flags.

Signed-off-by: Mark Brown <broonie@kernel.org>
---
Changes in v2:
- Use linux/wait.h rather than defining things locally.
- Link to v1: https://lore.kernel.org/r/20231020-nolibc-waitpid-flags-v1-1-8137072dae14@kernel.org
---
 tools/include/nolibc/types.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/include/nolibc/types.h b/tools/include/nolibc/types.h
index 8cfc4c860fa4..ad0ddaa89e50 100644
--- a/tools/include/nolibc/types.h
+++ b/tools/include/nolibc/types.h
@@ -12,6 +12,7 @@
 #include <linux/reboot.h> /* for LINUX_REBOOT_* */
 #include <linux/stat.h>
 #include <linux/time.h>
+#include <linux/wait.h>
 
 
 /* Only the generic macros and types may be defined here. The arch-specific
@@ -108,9 +109,6 @@
 #define WTERMSIG(status)    ((status) & 0x7f)
 #define WIFSIGNALED(status) ((status) - 1 < 0xff)
 
-/* waitpid() flags */
-#define WNOHANG      1
-
 /* standard exit() codes */
 #define EXIT_SUCCESS 0
 #define EXIT_FAILURE 1

---
base-commit: 6465e260f48790807eef06b583b38ca9789b6072
change-id: 20231020-nolibc-waitpid-flags-80ac075ab978

Best regards,
-- 
Mark Brown <broonie@kernel.org>

Re: [PATCH v2] tools/nolibc: Use linux/wait.h rather than duplicating it

[Thomas Weißschuh]

Thanks!

Oct 23, 2023 20:42:52 Mark Brown <broonie@kernel.org>:

> Linux defines a few custom flags for waitpid() which aren't currently
> provided by nolibc, make them available to nolibc based programs by just
> including linux/wait.h where they are defined instead of defining our
> own copy of the flags.
>
> Signed-off-by: Mark Brown <broonie@kernel.org>

Acked-by: Thomas Weißschuh <linux@weissschuh.net>

I can apply it, but only next week.

Thomas

Re: [PATCH v2] tools/nolibc: Use linux/wait.h rather than duplicating it

[Willy Tarreau]

On Tue, Oct 24, 2023 at 05:59:13PM +0200, Thomas Weißschuh  wrote:
> Thanks!
> 
> Oct 23, 2023 20:42:52 Mark Brown <broonie@kernel.org>:
> 
> > Linux defines a few custom flags for waitpid() which aren't currently
> > provided by nolibc, make them available to nolibc based programs by just
> > including linux/wait.h where they are defined instead of defining our
> > own copy of the flags.
> >
> > Signed-off-by: Mark Brown <broonie@kernel.org>
> 
> Acked-by: Thomas Weißschuh <linux@weissschuh.net>
> 
> I can apply it, but only next week.

Yeah I'm fine as well, thanks Mark for this. I'm still too short on
time these days but if I manage to upload it sooner, I'll let you know.

Thanks!
Willy

Re: [PATCH v2] tools/nolibc: Use linux/wait.h rather than duplicating it

[Willy Tarreau]

On Mon, Oct 23, 2023 at 07:42:45PM +0100, Mark Brown wrote:
> Linux defines a few custom flags for waitpid() which aren't currently
> provided by nolibc, make them available to nolibc based programs by just
> including linux/wait.h where they are defined instead of defining our
> own copy of the flags.
> 
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
> Changes in v2:
> - Use linux/wait.h rather than defining things locally.
> - Link to v1: https://lore.kernel.org/r/20231020-nolibc-waitpid-flags-v1-1-8137072dae14@kernel.org

Now merged into nolibc/next, thank you Mark!

Willy