X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5c34a38ad47b5bec1535a4c6c3272f8b4b2364bd..67506f8a343d03fae9f5a98e89cbd431426347cc:/sbr/utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index 99207e32..610f7904 100644
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -328,7 +328,10 @@ nmh_strcasestr (const char *s1, const char *s2) {
 
 int
 nmh_init(const char *argv0, int read_context) {
-    setlocale(LC_ALL, "");
+    if (! setlocale(LC_ALL, "")) {
+        admonish(NULL, "setlocale failed, check your LC_ALL, LC_CTYPE, and "
+                 "LANG environment variables");
+    }
 
     invo_name = r1bindex ((char *) argv0, '/');
 
@@ -353,6 +356,20 @@ nmh_init(const char *argv0, int read_context) {
     }
 }
 
+
+/* Returns copy of argument str with all characters converted to upper
+   case, and trimmed whitespace (see cpytrim()) . */
+char *
+upcase (const char *str) {
+    char *up = cpytrim (str);
+    char *cp;
+
+    for (cp = up; *cp; ++cp) { *cp = toupper ((unsigned char) *cp); }
+
+    return up;
+}
+
+
 /*
  * Scan for any 8-bit characters.  Return 1 if they exist.
  *
@@ -363,6 +380,9 @@ nmh_init(const char *argv0, int read_context) {
 int
 contains8bit(const char *start, const char *end)
 {
+    if (! start)
+	return 0;
+
     while (*start != '\0' && (!end || (start < end)))
 	if (! isascii((unsigned char) *start++))
 	    return 1;