X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/80ca91c25c3eb4f96f6c3842c1c14053ae69e80a..b1722537108cceec472480a551b9a7fb9c660c55:/sbr/utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index d9b903e7..fff1aacd 100644
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -360,6 +360,14 @@ 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)
@@ -375,10 +383,8 @@ void TrimSuffixC(char *s, int c)
 
 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, '/');
 
@@ -431,15 +437,24 @@ nmh_init(const char *argv0, int read_context) {
                 putchar ('\n');
             }
         }
-
-        return OK;
     } else {
-        int status = context_foil(NULL);
-        if (status != OK) {
+        if ((status = context_foil(NULL)) != OK) {
             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;
 }