X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8c69934299322c189e72259c2b31545c94697ea8..c347c3bbba2b3eea2442b641a11a381dea709cd8:/sbr/utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index 93ddc500..aa344b99 100644
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -1,6 +1,4 @@
-
-/*
- * utils.c -- various utility routines
+/* utils.c -- various utility routines
  *
  * This code is Copyright (c) 2006, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -105,7 +103,7 @@ pwd(void)
     static char curwd[PATH_MAX];
 
     if (!getcwd (curwd, PATH_MAX)) {
-        admonish (NULL, "unable to determine working directory");
+        inform("unable to determine working directory, continuing...");
         if (!mypath || !*mypath
                 || (strcpy (curwd, mypath), chdir (curwd)) == -1) {
             strcpy (curwd, "/");
@@ -357,7 +355,7 @@ nmh_strcasestr (const char *s1, const char *s2) {
 void trunccpy(char *dst, const char *src, size_t size)
 {
     if (!size) {
-        advise(NULL, "trunccpy: zero-length destination: \"%.20s\"",
+        inform("trunccpy: zero-length destination: \"%.20s\"",
             src ? src : "null");
         abort();
     }
@@ -416,8 +414,8 @@ void trim_suffix_c(char *s, int c)
 }
 
 
-/* ToLower runs all of s through tolower(3). */
-void ToLower(char *s)
+/* to_lower runs all of s through tolower(3). */
+void to_lower(char *s)
 {
     unsigned char *b;
 
@@ -426,8 +424,8 @@ void ToLower(char *s)
 }
 
 
-/* ToUpper runs all of s through toupper(3). */
-void ToUpper(char *s)
+/* to_upper runs all of s through toupper(3). */
+void to_upper(char *s)
 {
     unsigned char *b;
 
@@ -471,7 +469,7 @@ nmh_init(const char *argv0, int read_context) {
         }
 
         /* Check to see if the user is running a different (or older, if
-           specified) version of nmh than they had run bfore, and notify them
+           specified) version of nmh than they had run before, and notify them
            if so.  But only if read_context was set to a value to enable. */
         if (allow_version_check  &&  isatty (fileno (stdin))  &&
             isatty (fileno (stdout))  &&  isatty (fileno (stderr))) {
@@ -505,8 +503,8 @@ nmh_init(const char *argv0, int read_context) {
     }
 
     if (! setlocale (LC_ALL, locale)) {
-        admonish (NULL, "setlocale failed, check your LC_ALL, LC_CTYPE, and "
-                 "LANG environment variables");
+        inform("setlocale failed, check your LC_ALL, LC_CTYPE, and LANG "
+	    "environment variables, continuing...");
     }
 
     return status;
@@ -553,7 +551,7 @@ char *
 upcase (const char *str) {
     char *up = cpytrim (str);
 
-    ToUpper(up);
+    to_upper(up);
 
     return up;
 }