strchrnul is a GNU libc extension, add a wrapper for other platforms

1 files changed, 11 insertions, 0 deletions

diff --git a/XUtils.h b/XUtils.h
index fd1087d5..7526df3e 100644
--- a/XUtils.h
+++ b/XUtils.h
@@ -56,6 +56,17 @@ void String_freeArray(char** s);
 
 char* String_readLine(FILE* fd) ATTR_MALLOC;
 
+static inline char* String_strchrnul(const char* s, int c) {
+#ifdef HAVE_STRCHRNUL
+   return strchrnul(s, c);
+#else
+   char* result = strchr(s, c);
+   if (result)
+      return result;
+   return strchr(s, '\0');
+#endif
+}
+
 /* Always null-terminates dest. Caller must pass a strictly positive size. */
 ATTR_ACCESS3_W(1, 3)
 ATTR_ACCESS3_R(2, 3)