fix: add STRNLEN compatability macro

pekdon · pekdon · commit 8f1fdbc54a87 · 2021-12-06T17:34:26.000+01:00
Older SunOS systems come without strnlen, add STRNLEN macro in line with
the other str* compat macros.
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
@@ -45,6 +45,7 @@ check_function_exists(readlink HAVE_READLINK)
 check_function_exists(setpgid HAVE_SETPGID)
 check_function_exists(setsid HAVE_SETSID)
 check_function_exists(sigaction HAVE_SIGACTION)
+check_function_exists(strnlen HAVE_STRNLEN)
 check_function_exists(strcasecmp HAVE_STRCASECMP)
 check_function_exists(strncasecmp HAVE_STRNCASECMP)
 check_function_exists(strptime HAVE_STRPTIME)
diff --git a/config/config.h.in b/config/config.h.in
@@ -30,6 +30,7 @@
 #cmakedefine HAVE_SETPGID
 #cmakedefine HAVE_SETSID
 #cmakedefine HAVE_SIGACTION
+#cmakedefine HAVE_STRNLEN
 #cmakedefine HAVE_STRCASECMP
 #cmakedefine HAVE_STRINGS_H
 #cmakedefine HAVE_STRNCASECMP
diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
@@ -513,7 +513,7 @@ String cbuf_to_string(const char *buf, size_t size)
 String cstrn_to_string(const char *str, size_t maxsize)
   FUNC_ATTR_NONNULL_ALL
 {
-  return cbuf_to_string(str, strnlen(str, maxsize));
+  return cbuf_to_string(str, STRNLEN(str, maxsize));
 }
 
 /// Creates a String using the given C string. Unlike
diff --git a/src/nvim/message.c b/src/nvim/message.c
@@ -2056,7 +2056,7 @@ static void msg_puts_display(const char_u *str, int maxlen, int attr, int recurs
       msg_ext_last_attr = attr;
     }
     // Concat pieces with the same highlight
-    size_t len = strnlen((char *)str, maxlen);             // -V781
+    size_t len = STRNLEN(str, maxlen);             // -V781
     ga_concat_len(&msg_ext_last_chunk, (char *)str, len);
     msg_ext_cur_len += len;
     return;
diff --git a/src/nvim/strings.c b/src/nvim/strings.c
@@ -394,6 +394,18 @@ void del_trailing_spaces(char_u *ptr)
   }
 }
 
+#if !defined(HAVE_STRNLEN)
+size_t xstrnlen(const char *s, size_t n)
+  FUNC_ATTR_NONNULL_ALL FUNC_ATTR_PURE
+{
+  const char *end = memchr(s, '\0', n);
+  if (end == NULL) {
+    return n;
+  }
+  return end - s;
+}
+#endif
+
 #if (!defined(HAVE_STRCASECMP) && !defined(HAVE_STRICMP))
 /*
  * Compare two strings, ignoring case, using current locale.
diff --git a/src/nvim/vim.h b/src/nvim/vim.h
@@ -215,6 +215,11 @@ enum { FOLD_TEXT_LEN = 51, };  //!< buffer size for get_foldtext()
 // (vim_strchr() is now in strings.c)
 
 #define STRLEN(s)           strlen((char *)(s))
+#ifdef HAVE_STRNLEN
+#  define STRNLEN(s, n)     strnlen((char *)(s), (size_t)(n))
+#else
+#  define STRNLEN(s, n)     xstrnlen((char *)(s), (size_t)(n))
+#endif
 #define STRCPY(d, s)        strcpy((char *)(d), (char *)(s))
 #define STRNCPY(d, s, n)    strncpy((char *)(d), (char *)(s), (size_t)(n))
 #define STRLCPY(d, s, n)    xstrlcpy((char *)(d), (char *)(s), (size_t)(n))

Original file line number	Diff line number	Diff line change
`@@ -513,7 +513,7 @@ String cbuf_to_string(const char *buf, size_t size)`
`513`	`513`	`String cstrn_to_string(const char *str, size_t maxsize)`
`514`	`514`	`FUNC_ATTR_NONNULL_ALL`
`515`	`515`	`{`
`516`		`- return cbuf_to_string(str, strnlen(str, maxsize));`
	`516`	`+ return cbuf_to_string(str, STRNLEN(str, maxsize));`
`517`	`517`	`}`
`518`	`518`
`519`	`519`	`/// Creates a String using the given C string. Unlike`
Original file line number	Diff line number	Diff line change
`@@ -2056,7 +2056,7 @@ static void msg_puts_display(const char_u *str, int maxlen, int attr, int recurs`
`2056`	`2056`	`msg_ext_last_attr = attr;`
`2057`	`2057`	`}`
`2058`	`2058`	`// Concat pieces with the same highlight`
`2059`		`- size_t len = strnlen((char *)str, maxlen); // -V781`
	`2059`	`+ size_t len = STRNLEN(str, maxlen); // -V781`
`2060`	`2060`	`ga_concat_len(&msg_ext_last_chunk, (char *)str, len);`
`2061`	`2061`	`msg_ext_cur_len += len;`
`2062`	`2062`	`return;`