Replace getcpy() with mh_xstrdup() where the string isn't NULL.

[nmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index c9769fb0b909303789d855e6000ccfea9ae8d938..f5f2057032e3d1cf0afa2991ecf736e8a226a11b 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,12 +358,31 @@ nmh_strcasestr (const char *s1, const char *s2) {
 }
 
 
 }
 
 

+/* EndsWithC returns true if non-NULL string s ends with a c before the
+ * terminating NUL. */
+bool EndsWithC(char *s, int c)
+{
+    return *s && s[strlen(s) - 1] == c;
+}
+
+
+/* TrimSuffixC deletes c from the end of non-NULL string s if it's
+ * present, shortening s by 1.  Only one instance of c is removed. */
+void TrimSuffixC(char *s, int c)
+{
+    if (!*s)
+        return;
+
+    s += strlen(s) - 1;
+    if (*s == c)
+        *s = '\0';
+}
+
+

 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, '/');
 


@@ -418,15 +435,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;

 }
 
 
 }
 
 


@@ -453,15 +479,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;

 }
 
 
 }