X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1d4977afe4282d300f0f34e68974f4ef211ac769..db744b85cee9eccd9840823d06fa8ea1ff124993:/sbr/utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index 45ae9ddf..fff1aacd 100644
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -77,7 +77,7 @@ void *mh_xcalloc(size_t nelem, size_t elsize)
 }
 
 /* Duplicate a NUL-terminated string, exit on failure. */
-char *mh_xstrdup(char *src)
+char *mh_xstrdup(const char *src)
 {
     size_t n;
     char *dest;
@@ -103,7 +103,7 @@ void mh_xfree(void *ptr)
 char *
 pwd(void)
 {
-    register char *cp;
+    char *cp;
     static char curwd[PATH_MAX];
 
     if (!getcwd (curwd, PATH_MAX)) {
@@ -360,12 +360,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) {
-    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, '/');
 
@@ -418,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;
 }