Added -r to gcov invocation.

[nmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index 7306170952591eefc98f2ea019919d999930db1f..d6a96d846e2321b510d742df5211287e58d2f46a 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,33 @@ 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';
+}
+
+
+/* HasSuffix returns true if non-NULL s ends with non-NULL suffix. */
+bool HasSuffix(const char *s, const char *suffix)
+{
+    size_t ls, lsuf;
+
+    ls = strlen(s);
+    lsuf = strlen(suffix);
+
+    return lsuf <= ls && !strcmp(s + ls - lsuf, suffix);
+}
+
+
+/* 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,12 +403,30 @@ 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
 nmh_init(const char *argv0, int read_context) {

-    if (! setlocale(LC_ALL, "")) {
-        admonish(NULL, "setlocale failed, check your LC_ALL, LC_CTYPE, and "
-                 "LANG environment variables");
-    }
+    int status = OK;
+    char *locale;

 
     invo_name = r1bindex ((char *) argv0, '/');
 
 
     invo_name = r1bindex ((char *) argv0, '/');
 


@@ -439,15 +479,24 @@ nmh_init(const char *argv0, int read_context) {
                 putchar ('\n');
             }
         }
                 putchar ('\n');
             }
         }

-
-        return OK;

     } else {
     } else {

-        int status = context_foil(NULL);
-        if (status != OK) {
+        if ((status = context_foil(NULL)) != OK) {

             advise("", "failed to create minimal profile/context");
         }
             advise("", "failed to create minimal profile/context");
         }

-        return status;

     }
     }

+
+    /* Allow the user to set a locale in their profile.  Otherwise, use the
+       "" string to pull it from their environment, see setlocale(3). */
+    if ((locale = context_find ("locale")) == NULL) {
+        locale = "";
+    }
+
+    if (! setlocale (LC_ALL, locale)) {
+        admonish (NULL, "setlocale failed, check your LC_ALL, LC_CTYPE, and "
+                 "LANG environment variables");
+    }
+
+    return status;

 }
 
 
 }
 
 


@@ -465,7 +514,7 @@ nmh_version_changed (int older) {
            break for versions with multiple decimal points, etc. */
         const float current_version = strtof (VERSION, NULL);
         const float old_version =
            break for versions with multiple decimal points, etc. */
         const float current_version = strtof (VERSION, NULL);
         const float old_version =

-            context_version  &&  strncmp (context_version, "nmh-", 4) == 0
+            context_version  &&  HasPrefix(context_version, "nmh-")

             ?  strtof (context_version + 4, NULL)
             :  99999999;
 
             ?  strtof (context_version + 4, NULL)
             :  99999999;
 


@@ -474,15 +523,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;

 }
 
 
 }
 
 


@@ -491,9 +539,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;
 }