From 39b51c6d6e947778bf2b63fc9586a3236665881e Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 7 May 2024 13:07:45 -0400
Subject: build: Add checks for strtofflags() and string_to_flags()

---
 build/has/string-to-flags.c |  9 +++++++++
 build/has/strtofflags.c     |  9 +++++++++
 build/header.mk             |  2 ++
 src/bfstd.c                 | 16 +++++++++-------
 4 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 build/has/string-to-flags.c
 create mode 100644 build/has/strtofflags.c

diff --git a/build/has/string-to-flags.c b/build/has/string-to-flags.c
new file mode 100644
index 0000000..027d72c
--- /dev/null
+++ b/build/has/string-to-flags.c
@@ -0,0 +1,9 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <stddef.h>
+#include <util.h>
+
+int main(void) {
+	return string_to_flags(NULL, NULL, NULL);
+}
diff --git a/build/has/strtofflags.c b/build/has/strtofflags.c
new file mode 100644
index 0000000..73ecbcb
--- /dev/null
+++ b/build/has/strtofflags.c
@@ -0,0 +1,9 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <stddef.h>
+#include <unistd.h>
+
+int main(void) {
+	return strtofflags(NULL, NULL, NULL);
+}
diff --git a/build/header.mk b/build/header.mk
index d235fd0..2cd13fa 100644
--- a/build/header.mk
+++ b/build/header.mk
@@ -40,6 +40,8 @@ HEADERS := \
     gen/has/strerror-l.h \
     gen/has/strerror-r-gnu.h \
     gen/has/strerror-r-posix.h \
+    gen/has/string-to-flags.h \
+    gen/has/strtofflags.h \
     gen/has/timegm.h \
     gen/has/tm-gmtoff.h \
     gen/has/uselocale.h
diff --git a/src/bfstd.c b/src/bfstd.c
index f8ce871..0ac3a72 100644
--- a/src/bfstd.c
+++ b/src/bfstd.c
@@ -637,8 +637,14 @@ error:
 	return NULL;
 }
 
+#if BFS_HAS_STRTOFFLAGS
+#  define BFS_STRTOFFLAGS strtofflags
+#elif BFS_HAS_STRING_TO_FLAGS
+#  define BFS_STRTOFFLAGS string_to_flags
+#endif
+
 int xstrtofflags(const char **str, unsigned long long *set, unsigned long long *clear) {
-#if BSD && !__GNU__
+#ifdef BFS_STRTOFFLAGS
 	char *str_arg = (char *)*str;
 
 #if __OpenBSD__
@@ -649,11 +655,7 @@ int xstrtofflags(const char **str, unsigned long long *set, unsigned long long *
 	bfs_fflags_t set_arg = 0;
 	bfs_fflags_t clear_arg = 0;
 
-#if __NetBSD__
-	int ret = string_to_flags(&str_arg, &set_arg, &clear_arg);
-#else
-	int ret = strtofflags(&str_arg, &set_arg, &clear_arg);
-#endif
+	int ret = BFS_STRTOFFLAGS(&str_arg, &set_arg, &clear_arg);
 
 	*str = str_arg;
 	*set = set_arg;
@@ -663,7 +665,7 @@ int xstrtofflags(const char **str, unsigned long long *set, unsigned long long *
 		errno = EINVAL;
 	}
 	return ret;
-#else // !BSD
+#else // !BFS_STRTOFFLAGS
 	errno = ENOTSUP;
 	return -1;
 #endif
-- 
cgit v1.2.3