Added nmh_strcasestr() because POSIX doesn't have strcasestr().

diff --git a/h/utils.h b/h/utils.h
index 7a096a18fbe45c4d4c8521078fe9709bda1f4ecf..188d262f51fd63e4acdd0469bc91ca228f2532e5 100644 (file)
--- a/h/utils.h
+++ b/h/utils.h
@@ -21,3 +21,4 @@ void app_msgarg(struct msgs_array *, char *);
 int open_form(char **, char *);
 char *find_str (const char [], size_t, const char *);
 char *rfind_str (const char [], size_t, const char *);
 int open_form(char **, char *);
 char *find_str (const char [], size_t, const char *);
 char *rfind_str (const char [], size_t, const char *);

+char *nmh_strcasestr (const char *, const char *);

diff --git a/sbr/utils.c b/sbr/utils.c
index 87fedd584946bad98974f1b0cbdeecc204421b90..262e5767837b440464334c9bd672a81eb2c24d5c 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -279,3 +279,27 @@ rfind_str (const char buf[], size_t buflen, const char *str) {
 
     return NULL;
 }
 
     return NULL;
 }

+
+
+/* POSIX doesn't have strcasestr() so emulate it. */
+char *
+nmh_strcasestr (const char *s1, const char *s2) {
+    const size_t len = strlen (s2);
+
+    if (isupper ((unsigned char) s2[0])  ||  islower ((unsigned char)s2[0])) {
+        char first[3];
+        first[0] = (char) toupper ((unsigned char) s2[0]);
+        first[1] = (char) tolower ((unsigned char) s2[0]);
+        first[2] = '\0';
+
+        for (s1 = strpbrk (s1, first); s1; s1 = strpbrk (++s1, first)) {
+            if (! strncasecmp (s1, s2, len)) return (char *) s1;
+        }
+    } else {
+        for (s1 = strchr (s1, s2[0]); s1; s1 = strchr (++s1, s2[0])) {
+            if (! strncasecmp (s1, s2, len)) return (char *) s1;
+        }
+    }
+
+    return NULL;
+}