Use HasPrefix() instead of strncmp().

[nmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index fff1aacd64debbaf62c4165c17fe2dc0214f436b..06835d2bfcb57e9487ed478a15a2bcf181af17c0 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -46,9 +46,7 @@ void *mh_xrealloc(void *ptr, size_t size)
 
     /* Copy POSIX behaviour, coping with non-POSIX systems. */
     if (size == 0) {
 
     /* Copy POSIX behaviour, coping with non-POSIX systems. */
     if (size == 0) {

-        if (ptr) {
-            free(ptr);
-        }
+        mh_xfree(ptr);

         return mh_xmalloc(1); /* Get a unique pointer. */
     }
     if (!ptr)
         return mh_xmalloc(1); /* Get a unique pointer. */
     }
     if (!ptr)


@@ -360,9 +358,21 @@ nmh_strcasestr (const char *s1, const char *s2) {
 }
 
 
 }
 
 

-/* EndsWithC returns true if non-NULL string s ends with a c before the
+/* HasPrefix returns true if non-NULL s starts with non-NULL prefix. */
+bool HasPrefix(const char *s, const char *prefix)
+{
+    while (*s && *s == *prefix) {
+        s++;
+        prefix++;
+    }
+
+    return *prefix == '\0';
+}
+
+
+/* HasSuffixC returns true if non-NULL string s ends with a c before the

  * terminating NUL. */
  * terminating NUL. */

-bool EndsWithC(char *s, int c)
+bool HasSuffixC(const char *s, int c)

 {
     return *s && s[strlen(s) - 1] == c;
 }
 {
     return *s && s[strlen(s) - 1] == c;
 }


@@ -381,6 +391,26 @@ void TrimSuffixC(char *s, int c)
 }
 
 
 }
 
 

+/* ToLower runs all of s through tolower(3). */
+void ToLower(char *s)
+{
+    unsigned char *b;
+
+    for (b = (unsigned char *)s; (*b = tolower(*b)); b++)
+        ;
+}
+
+
+/* ToUpper runs all of s through toupper(3). */
+void ToUpper(char *s)
+{
+    unsigned char *b;
+
+    for (b = (unsigned char *)s; (*b = toupper(*b)); b++)
+        ;
+}
+
+

 int
 nmh_init(const char *argv0, int read_context) {
     int status = OK;
 int
 nmh_init(const char *argv0, int read_context) {
     int status = OK;


@@ -481,15 +511,14 @@ nmh_version_changed (int older) {
         }
 
         return old_version < current_version  ?  1  :  0;
         }
 
         return old_version < current_version  ?  1  :  0;

-    } else {
-        if (context_version == NULL  ||  strcmp(context_version, "nmh-" VERSION) != 0) {
-            context_replace ("Version", "nmh-" VERSION);
+    }

 
 

-            return 1;
-        } else {
-            return 0;
-        }
+    if (context_version == NULL  ||  strcmp(context_version, "nmh-" VERSION) != 0) {
+        context_replace ("Version", "nmh-" VERSION);
+        return 1;

     }
     }

+
+    return 0;

 }
 
 
 }
 
 


@@ -498,9 +527,8 @@ nmh_version_changed (int older) {
 char *
 upcase (const char *str) {
     char *up = cpytrim (str);
 char *
 upcase (const char *str) {
     char *up = cpytrim (str);

-    char *cp;

 
 

-    for (cp = up; *cp; ++cp) { *cp = toupper ((unsigned char) *cp); }
+    ToUpper(up);

 
     return up;
 }
 
     return up;
 }