Use "mhparam etcdir" instead of hard-coded etc in build_nmh.

[nmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index 4405f4c95a5c52d5cf406d52cc95535479b71781..9dece994980ae44cea38f51e188d4af4713913a6 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -79,7 +79,9 @@ pwd(void)
         if (!mypath || !*mypath
                 || (strcpy (curwd, mypath), chdir (curwd)) == -1) {
             strcpy (curwd, "/");
-            chdir (curwd);
+            if (chdir (curwd) < 0) {
+                advise (curwd, "chdir");
+            }
         }
         return curwd;
     }
@@ -328,7 +330,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, '/');