portability for {Free,Net,Open,}BSD #505

agreppin · 2024-06-11T21:19:17Z

No description provided.

landley · 2024-06-15T01:19:05Z

Touches more files at once than I'm happy with. (The test suite plumbing tends to use SKIP rather than if around the tests, to avoid running different NUMBERS of tests on different targets, and silently skipping tests without saying "SKIP:")...

Came to the web interface to see if the 1/2 that got squished together by wget 505.patch provided better granularity, but doesn't look like it. (I can break it up easily enough, but then either I'm faking metadata or don't attribute it properly...)

I'll take a swing at it...

agreppin · 2024-06-15T09:24:26Z

please note that I only tested with this config:

CONFIG_TOYBOX_FORK=y
CONFIG_PRINTF=y
CONFIG_SORT_FLOAT=y
CONFIG_BASE64=y
CONFIG_HELP=y
CONFIG_GZIP=y
CONFIG_GUNZIP=y
CONFIG_ZCAT=y
CONFIG_TOYBOX=y
CONFIG_TOYBOX_LSM_NONE=y
CONFIG_TOYBOX_FLOAT=y
CONFIG_TOYBOX_HELP=y
CONFIG_TOYBOX_ZHELP=y
CONFIG_TOYBOX_DEBUG=y
CONFIG_TOYBOX_UID_SYS=100
CONFIG_TOYBOX_UID_USR=500

reactive-firewall

I did a partial Review in hopes that it helps @landley, and the changes to lib/protability.* are trivial, I'll recommend further review of scripts specificly in the case of toybox's long-term plans.

See specific comments inline.

🙇 Hope this helps.

reactive-firewall · 2025-08-16T18:33:53Z

lib/portability.c

+#ifdef __OpenBSD__
+#define syscall(...) -1
+#endif


🧹 NIT - Plea for a comment here.

Rational - It would be nice (but not strictly not necessary) to have a comment about why this portability trick is done for OpenBSD for those of us not yet initiated.

reactive-firewall · 2025-08-16T18:42:11Z

lib/portability.c

👍 LGTM; Regarding lib/portability.c

I see no issue adding the || defined(__NetBSD__) checks (:speak_no_evil: as long as the NetBSD headers don't fall under GPL or something that might prevent inclusion, etc.) as they are straightforward.

See also 🧹 NIT suggestion inline regarding adding a helpful comment.

reactive-firewall · 2025-08-16T18:53:27Z

lib/portability.h

@@ -155,9 +155,15 @@ void *memmem(const void *haystack, size_t haystack_length,
 #define IS_BIG_ENDIAN 0
 #endif

+#ifdef __OpenBSD__


🧹 NIT - consider consistent macro style

While adding a check on the __OpenBSD__ here is wise, consider consistent macro style and re-use the #if defined(__OpenBSD__) style (as above on line 148) to help future-proof this check against additional compiler portability.

This check on line 158 is only reached if the compiler already supported the defined(...) macro after-all.

Please consider:

Suggested change

#ifdef __OpenBSD__

#if defined(__OpenBSD__)

🙇 hope this helps.

See Also around lines 243-249 for similar style suggestion

reactive-firewall · 2025-08-16T18:58:06Z

lib/portability.h

@@ -240,7 +246,12 @@ int posix_fallocate(int, off_t, off_t);
 #include <xlocale.h>
 #endif

-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#ifdef __NetBSD__


🧹 NIT - consider consistent macro style

Similar to before; TL;DR

While adding a pre-check on the __NetBSD__ here is good, consider consistent macro style and re-use the #if defined(__NetBSD__) style (as followed on line 254) to help future-proof this check against additional compiler portability.

Please consider:

Suggested change

#ifdef __NetBSD__

#if defined(__NetBSD__) && !defined(statfs)

🙇 hope this helps.

See Also around line 158 for similar style suggestion

reactive-firewall · 2025-08-16T19:01:26Z

lib/portability.h

👍 LGTM; Regarding lib/portability.h with the caveat of two minor style suggestions. See inline suggestions for details.

reactive-firewall · 2025-08-16T19:12:31Z

scripts/portability.sh

@@ -28,6 +37,11 @@ fi
 # And ones only gcc produces
  CFLAGS+=" -Wno-restrict -Wno-format-overflow"

+case "$(uname)" in
+'NetBSD'|'OpenBSD')
+  unset ASAN;;


😕 does OpenBSD really have issues with address sanitation? Please explain for those of us who are uninitiated. (🙏 with small, gentle words please)

reactive-firewall · 2025-08-16T19:12:34Z

scripts/portability.sh

@@ -8,6 +8,10 @@ then
  exit 1
 fi

+case ${OD-} in
+'') OD=$(command -v god || command -v ggod || echo od);; # use od from GNU coretutils


🙅 This change concerns me by deliberately introducing a reliance on "GNU coretutils" and places the original od command at the end of the chained-or-logic lending to a preference on GNU.

Perhaps at least consider maintaining od at the start of the logic. Otherwise please add a comment for why this logic is needed for those of us yet uninitiated.

reactive-firewall · 2025-08-16T19:17:09Z

tests/zcat.test

@@ -4,6 +4,8 @@

 #testing "name" "command" "result" "infile" "stdin"

+HEAD=$(command -v ghead || echo head) # use head from GNU coreutils


😕 Similar to before in scripts/portability.sh this preference for GNU variants concerns me. Please consider maintaining the preference for the original variant in the chained-or-logic. Otherwise please enlighten us uninitiated about why NetBSD would require this.

reactive-firewall · 2025-08-16T19:22:22Z

main.c

@@ -151,6 +151,10 @@ void check_help(char **arg)
  }
 }

+#ifdef __NetBSD__


🧹 NIT - Consider a consistent macro style

Similar to other files; TL;DR

Please consider:

Suggested change

#ifdef __NetBSD__

#if defined(__NetBSD__) && !defined(uselocale)

// use a No-OP for NetBSD instead of uselocale() for compatability

reactive-firewall · 2025-08-16T19:24:44Z

main.c

🤷 LGTM; Regarding main.c the no-op implementation for uselocale is straight forward. See suggestion on style inline.

portability for {Free,Net,Open,}BSD

f595efb

agreppin force-pushed the portability branch from 4eb5205 to f595efb Compare June 15, 2024 09:42

reactive-firewall reviewed Aug 16, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

portability for {Free,Net,Open,}BSD #505

portability for {Free,Net,Open,}BSD #505

Uh oh!

agreppin commented Jun 11, 2024

Uh oh!

landley commented Jun 15, 2024

Uh oh!

agreppin commented Jun 15, 2024

Uh oh!

reactive-firewall left a comment

Uh oh!

reactive-firewall Aug 16, 2025

Uh oh!

reactive-firewall Aug 16, 2025

Uh oh!

reactive-firewall Aug 16, 2025

Uh oh!

reactive-firewall Aug 16, 2025

Uh oh!

reactive-firewall Aug 16, 2025

Uh oh!

reactive-firewall Aug 16, 2025

Uh oh!

reactive-firewall Aug 16, 2025

Uh oh!

reactive-firewall Aug 16, 2025

Uh oh!

reactive-firewall Aug 16, 2025

Uh oh!

reactive-firewall Aug 16, 2025

Uh oh!

Uh oh!

	#ifdef __NetBSD__
	#if defined(__NetBSD__) && !defined(statfs)

		@@ -4,6 +4,8 @@

		#testing "name" "command" "result" "infile" "stdin"

		HEAD=$(command -v ghead \|\| echo head) # use head from GNU coreutils

	#ifdef __NetBSD__
	#if defined(__NetBSD__) && !defined(uselocale)
	// use a No-OP for NetBSD instead of uselocale() for compatability

portability for {Free,Net,Open,}BSD #505

Are you sure you want to change the base?

portability for {Free,Net,Open,}BSD #505

Uh oh!

Conversation

agreppin commented Jun 11, 2024

Uh oh!

landley commented Jun 15, 2024

Uh oh!

agreppin commented Jun 15, 2024

Uh oh!

reactive-firewall left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!