add rcutils_strncasecmp with test.

Signed-off-by: Tomoya.Fujita <[email protected]>

Author: fujitatomoya

CMakeLists.txt

@@ -64,8 +64,8 @@ set(rcutils_sources
   src/repl_str.c
   src/shared_library.c
   src/snprintf.c
-  src/strcasecmp.c
   src/split.c
+  src/strcasecmp.c
   src/strdup.c
   src/strerror.c
   src/string_array.c

include/rcutils/strcasecmp.h

@@ -20,8 +20,6 @@ extern "C"
 {
 #endif
 
-#include <string.h>
-
 #include "rcutils/macros.h"
 #include "rcutils/visibility_control.h"
 
@@ -42,6 +40,25 @@ RCUTILS_WARN_UNUSED
 int
 rcutils_strcasecmp(const char * s1, const char * s2);
 
+/// Case insensitive string compare up to count characters.
+/**
+ * This function compares two strings ignoring case which just wraps strncasecmp()
+ * or strnicmp() in a portable way. This performs a byte-by-byte comparison of the
+ * strings s1 and s2 up to count characters of s1 and s2, ignoring the case of the
+ * characters.
+ *
+ * \param[in] s1 String with null terminated to compare.
+ * \param[in] s2 String with null terminated to compare.
+ * \param[in] n Count characters to compare.
+ * \return An integer less than, equal to, or greater than zero if s1 is, after
+ *   ignoring case, found to be less than, to match, or be greater than s2,
+ *   respectively.
+ */
+RCUTILS_PUBLIC
+RCUTILS_WARN_UNUSED
+int
+rcutils_strncasecmp(const char * s1, const char * s2, size_t n);
+
 #ifdef __cplusplus
 }
 #endif

src/strcasecmp.c

@@ -17,18 +17,43 @@ extern "C"
 {
 #endif
 
+#include <errno.h>
+#include <string.h>
+
 #include "rcutils/strcasecmp.h"
 
 int
 rcutils_strcasecmp(const char * s1, const char * s2)
 {
+  RCUTILS_CAN_FAIL_WITH({errno = EINVAL; return -1;});
+
+  if (s1 == NULL || s2 == NULL) {
+    errno = EINVAL;
+    return -1;
+  }
 #ifndef _WIN32
   return strcasecmp(s1, s2);
 #else
   return stricmp(s1, s2);
 #endif
 }
 
+int
+rcutils_strncasecmp(const char * s1, const char * s2, size_t n)
+{
+  RCUTILS_CAN_FAIL_WITH({errno = EINVAL; return -1;});
+
+  if (s1 == NULL || s2 == NULL) {
+    errno = EINVAL;
+    return -1;
+  }
+#ifndef _WIN32
+  return strncasecmp(s1, s2, n);
+#else
+  return strnicmp(s1, s2, n);
+#endif
+}
+
 #ifdef __cplusplus
 }
 #endif

test/test_strcasecmp.cpp

@@ -18,6 +18,10 @@
 
 // Tests the rcutils_strcasecmp() function.
 TEST(TestStrcasecmp, test_strcasecmp) {
+  EXPECT_EQ(-1, rcutils_strcasecmp(NULL, NULL));
+  EXPECT_EQ(-1, rcutils_strcasecmp(NULL, ""));
+  EXPECT_EQ(-1, rcutils_strcasecmp("", NULL));
+
   EXPECT_EQ(0, rcutils_strcasecmp("", ""));
   EXPECT_EQ(0, rcutils_strcasecmp("abc", "abc"));
   EXPECT_EQ(0, rcutils_strcasecmp("ABC", "ABC"));
@@ -56,3 +60,51 @@ TEST(TestStrcasecmp, test_strcasecmp) {
   EXPECT_NE(0, rcutils_strcasecmp("ab1C", "abc"));
   EXPECT_NE(0, rcutils_strcasecmp("abc", "ab1C"));
 }
+
+// Tests the rcutils_strncasecmp() function.
+TEST(TestStrcasecmp, test_strncasecmp) {
+  EXPECT_EQ(-1, rcutils_strncasecmp(NULL, NULL, 0));
+  EXPECT_EQ(-1, rcutils_strncasecmp(NULL, "", 1));
+  EXPECT_EQ(-1, rcutils_strncasecmp("", NULL, 1));
+
+  EXPECT_EQ(0, rcutils_strncasecmp("", "", 0));
+  EXPECT_EQ(0, rcutils_strncasecmp("", "", 1));
+  EXPECT_EQ(0, rcutils_strncasecmp("abc", "", 0));
+  EXPECT_EQ(0, rcutils_strncasecmp("", "abc", 0));
+  EXPECT_EQ(0, rcutils_strncasecmp("abc", "abc", 3));
+  EXPECT_EQ(0, rcutils_strncasecmp("ABC", "ABC", 3));
+  EXPECT_EQ(0, rcutils_strncasecmp("1abc", "1abc", 4));
+  EXPECT_EQ(0, rcutils_strncasecmp("abc1", "abc1", 4));
+  EXPECT_EQ(0, rcutils_strncasecmp("1ABC", "1ABC", 4));
+  EXPECT_EQ(0, rcutils_strncasecmp("ABC1", "ABC1", 4));
+  EXPECT_EQ(0, rcutils_strncasecmp("ABC", "abc", 1));
+  EXPECT_EQ(0, rcutils_strncasecmp("abc", "ABC", 1));
+  EXPECT_EQ(0, rcutils_strncasecmp("Abc", "abc", 2));
+  EXPECT_EQ(0, rcutils_strncasecmp("abc", "Abc", 2));
+  EXPECT_EQ(0, rcutils_strncasecmp("Abc", "Abc", 2));
+  EXPECT_EQ(0, rcutils_strncasecmp("aBc", "abc", 3));
+  EXPECT_EQ(0, rcutils_strncasecmp("abc", "aBc", 3));
+  EXPECT_EQ(0, rcutils_strncasecmp("aBc", "aBc", 3));
+  EXPECT_EQ(0, rcutils_strncasecmp("abC", "abc", 4));
+  EXPECT_EQ(0, rcutils_strncasecmp("abc", "abC", 4));
+  EXPECT_EQ(0, rcutils_strncasecmp("abC", "abC", 4));
+
+  EXPECT_NE(0, rcutils_strncasecmp("", "abc", 1));
+  EXPECT_NE(0, rcutils_strncasecmp("abc", "", 1));
+  EXPECT_NE(0, rcutils_strncasecmp("abcd", "abc", 4));
+  EXPECT_NE(0, rcutils_strncasecmp("abc", "abcd", 4));
+  EXPECT_NE(0, rcutils_strncasecmp("abcD", "abc", 4));
+  EXPECT_NE(0, rcutils_strncasecmp("abc", "abcD", 4));
+  EXPECT_NE(0, rcutils_strncasecmp("1abc", "abc", 4));
+  EXPECT_NE(0, rcutils_strncasecmp("abc", "1abc", 4));
+  EXPECT_NE(0, rcutils_strncasecmp("abc1", "abc", 4));
+  EXPECT_NE(0, rcutils_strncasecmp("abc", "abc1", 4));
+  EXPECT_NE(0, rcutils_strncasecmp("ABCd", "abc", 4));
+  EXPECT_NE(0, rcutils_strncasecmp("abc", "ABCd", 4));
+  EXPECT_NE(0, rcutils_strncasecmp("1Abc", "abc", 4));
+  EXPECT_NE(0, rcutils_strncasecmp("abc", "1Abc", 4));
+  EXPECT_NE(0, rcutils_strncasecmp("a1Bc", "abc", 4));
+  EXPECT_NE(0, rcutils_strncasecmp("abc", "a1Bc", 4));
+  EXPECT_NE(0, rcutils_strncasecmp("ab1C", "abc", 4));
+  EXPECT_NE(0, rcutils_strncasecmp("abc", "ab1C", 4));
+}