OpenBSD: Use our own implementation of wcsnlen()if not available

src/controllers/hid/hiddevice.cpp

@@ -33,16 +33,16 @@ DeviceInfo::DeviceInfo(
           usage_page(device_info.usage_page),
           usage(device_info.usage),
           interface_number(device_info.interface_number),
-          m_pathRaw(device_info.path, mixxx::strnlen(device_info.path, PATH_MAX)),
+          m_pathRaw(device_info.path, mixxx::strnlen_s(device_info.path, PATH_MAX)),
           m_serialNumberRaw(device_info.serial_number,
-                  mixxx::wcsnlen(device_info.serial_number,
+                  mixxx::wcsnlen_s(device_info.serial_number,
                           kDeviceInfoStringMaxLength)),
           m_manufacturerString(mixxx::convertWCStringToQString(
                   device_info.manufacturer_string,
-                  mixxx::wcsnlen(device_info.manufacturer_string,
+                  mixxx::wcsnlen_s(device_info.manufacturer_string,
                           kDeviceInfoStringMaxLength))),
           m_productString(mixxx::convertWCStringToQString(device_info.product_string,
-                  mixxx::wcsnlen(device_info.product_string,
+                  mixxx::wcsnlen_s(device_info.product_string,
                           kDeviceInfoStringMaxLength))),
           m_serialNumber(mixxx::convertWCStringToQString(
                   m_serialNumberRaw.data(), m_serialNumberRaw.size())) {

src/util/string.h

@@ -35,27 +35,40 @@ class StringCollator {
 /// A nullptr-safe variant of the corresponding standard C function.
 ///
 /// Treats nullptr like an empty string and returns 0.
-inline std::size_t strnlen(
+/// The c11 strnlen_s() is not available on all targets
+inline std::size_t strnlen_s(
         const char* str,
-        std::size_t len) {
+        std::size_t maxlen) {
     if (str == nullptr) {
         return 0;
     }
-    // Invoke the global function
-    return ::strnlen(str, len);
+    // Invoke the global function and benefit from SIMD implementations
+    return ::strnlen(str, maxlen);
 }
 
 /// A nullptr-safe variant of the corresponding standard C function.
 ///
 /// Treats nullptr like an empty string and returns 0.
-inline std::size_t wcsnlen(
+/// The c11 wcsnlen_s is not available on all targets
+/// and wcsnlen() is not available on OpenBSD
+inline std::size_t wcsnlen_s(
         const wchar_t* wcs,
-        std::size_t len) {
+        std::size_t maxlen) {
     if (wcs == nullptr) {
         return 0;
     }
-    // Invoke the global function
-    return ::wcsnlen(wcs, len);
+#if !defined(__BSD__) || defined(__USE_XOPEN2K8)
+    // Invoke the global function SIMD implementations
+    return ::wcsnlen(wcs, maxlen);
+#else
+    std::size_t n;
+    for (n = 0; n < maxlen; n++) {
+        if (!wcs[n]) {
+            break;
+        }
+    }
+    return n;
+#endif
 }
 
 /// Convert a wide-character C string to QString.