X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/92c3b05ef3e582d64b3cecfc261fdd66ef13a4ef..dc03747a155e498e30c201051b3f7adb882c016e:/sbr/utils.c?ds=inline

diff --git a/sbr/utils.c b/sbr/utils.c
index 8debe1aa..d3d4a860 100644
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -5,9 +5,18 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/utils.h>
-#include <h/signals.h>
+#include "h/mh.h"
+#include "read_yes_or_no_if_tty.h"
+#include "concat.h"
+#include "r1bindex.h"
+#include "context_foil.h"
+#include "context_replace.h"
+#include "context_read.h"
+#include "context_find.h"
+#include "print_help.h"
+#include "error.h"
+#include "h/utils.h"
+#include "h/signals.h"
 #include "m_mktemp.h"
 #include "makedir.h"
 #include <fcntl.h>
@@ -28,7 +37,8 @@ const char plurals[] = "s";
 #define MAXMSGS 256
 
 /* Call malloc(3), exiting on NULL return. */
-void *mh_xmalloc(size_t size)
+void *
+mh_xmalloc(size_t size)
 {
     void *p;
 
@@ -36,13 +46,14 @@ void *mh_xmalloc(size_t size)
         size = 1; /* Some mallocs don't like 0. */
     p = malloc(size);
     if (!p)
-        adios(NULL, "malloc failed, size wanted: %zu", size);
+        die("malloc failed, size wanted: %zu", size);
 
     return p;
 }
 
 /* Call realloc(3), exiting on NULL return. */
-void *mh_xrealloc(void *ptr, size_t size)
+void *
+mh_xrealloc(void *ptr, size_t size)
 {
     void *new;
 
@@ -56,13 +67,14 @@ void *mh_xrealloc(void *ptr, size_t size)
 
     new = realloc(ptr, size);
     if (!new)
-        adios(NULL, "realloc failed, size wanted: %zu", size);
+        die("realloc failed, size wanted: %zu", size);
 
     return new;
 }
 
 /* Call calloc(3), exiting on NULL return. */
-void *mh_xcalloc(size_t nelem, size_t elsize)
+void *
+mh_xcalloc(size_t nelem, size_t elsize)
 {
     void *p;
 
@@ -71,13 +83,14 @@ void *mh_xcalloc(size_t nelem, size_t elsize)
 
     p = calloc(nelem, elsize);
     if (!p)
-        adios(NULL, "calloc failed, size wanted: %zu * %zu", nelem, elsize);
+        die("calloc failed, size wanted: %zu * %zu", nelem, elsize);
 
     return p;
 }
 
 /* Duplicate a NUL-terminated string, exit on failure. */
-char *mh_xstrdup(const char *src)
+char *
+mh_xstrdup(const char *src)
 {
     size_t n;
     char *dest;
@@ -117,13 +130,15 @@ pwd(void)
     return curwd;
 }
 
-/*
- * add   -- If "s1" is NULL, this routine just creates a
- *       -- copy of "s2" into newly malloc'ed memory.
- *       --
- *       -- If "s1" is not NULL, then copy the concatenation
- *       -- of "s1" and "s2" (note the order) into newly
- *       -- malloc'ed memory.  Then free "s1".
+/* add returns a newly malloc'd string, exiting on failure.  The order
+ * of the parameters is unusual.  A NULL parameter is treated as an
+ * empty string.  s1 is free'd.  Use mh_xstrdup(s) rather than add(s,
+ * NULL), with FENDNULL() if s might be NULL.
+ *
+ *     add(NULL, NULL) -> ""
+ *     add(NULL, "foo") -> "foo"
+ *     add("bar", NULL) -> "bar"
+ *     add("bar", "foo") -> "foobar"
  */
 char *
 add (const char *s2, char *s1)
@@ -171,7 +186,8 @@ addlist (char *list, const char *item)
  * folder_exists
  *      Check to see if a folder exists.
  */
-int folder_exists(const char *folder)
+int
+folder_exists(const char *folder)
 {
     struct stat st;
 
@@ -183,7 +199,8 @@ int folder_exists(const char *folder)
  *      Check to see if a folder exists, if not, prompt the user to create
  *      it.
  */
-void create_folder(char *folder, int autocreate, void (*done_callback)(int))
+void
+create_folder(char *folder, int autocreate, void (*done_callback)(int))
 {
     struct stat st;
     extern int errno;
@@ -203,7 +220,7 @@ void create_folder(char *folder, int autocreate, void (*done_callback)(int))
             done_callback (1);
         }
         if (!makedir (folder))
-            adios (NULL, "unable to create folder %s", folder);
+            die("unable to create folder %s", folder);
     }
 }
 
@@ -218,7 +235,7 @@ num_digits (int n)
 
     /* Sanity check */
     if (n < 0)
-        adios (NULL, "oops, num_digits called with negative value");
+        die("oops, num_digits called with negative value");
 
     if (n == 0)
         return 1;
@@ -270,7 +287,8 @@ app_msgnum(struct msgnum_array *msgs, int msgnum)
  * pointer so that the caller can modify it.
  */
 char *
-find_str (const char buf[], size_t buflen, const char *str) {
+find_str (const char buf[], size_t buflen, const char *str)
+{
     const size_t len = strlen (str);
     size_t i;
 
@@ -289,7 +307,8 @@ find_str (const char buf[], size_t buflen, const char *str) {
  * pointer so that the caller can modify it.
  */
 char *
-rfind_str (const char buf[], size_t buflen, const char *str) {
+rfind_str (const char buf[], size_t buflen, const char *str)
+{
     const size_t len = strlen (str);
     size_t i;
 
@@ -303,7 +322,8 @@ rfind_str (const char buf[], size_t buflen, const char *str) {
 
 /* POSIX doesn't have strcasestr() so emulate it. */
 char *
-nmh_strcasestr (const char *s1, const char *s2) {
+nmh_strcasestr (const char *s1, const char *s2)
+{
     const size_t len = strlen (s2);
 
     if (isupper ((unsigned char) s2[0])  ||  islower ((unsigned char)s2[0])) {
@@ -333,7 +353,8 @@ nmh_strcasestr (const char *s1, const char *s2) {
  * reporting a possibly very long external string back to the user.  One
  * of its advantages over strncpy(3) is it doesn't pad in the common
  * case of no truncation. */
-void trunccpy(char *dst, const char *src, size_t size)
+void
+trunccpy(char *dst, const char *src, size_t size)
 {
     if (!size) {
         inform("trunccpy: zero-length destination: \"%.20s\"",
@@ -351,7 +372,8 @@ void trunccpy(char *dst, const char *src, size_t size)
 
 
 /* has_prefix returns true if non-NULL s starts with non-NULL prefix. */
-bool has_prefix(const char *s, const char *prefix)
+bool
+has_prefix(const char *s, const char *prefix)
 {
     while (*s && *s == *prefix) {
         s++;
@@ -363,7 +385,8 @@ bool has_prefix(const char *s, const char *prefix)
 
 
 /* has_suffix returns true if non-NULL s ends with non-NULL suffix. */
-bool has_suffix(const char *s, const char *suffix)
+bool
+has_suffix(const char *s, const char *suffix)
 {
     size_t ls, lsuf;
 
@@ -376,7 +399,8 @@ bool has_suffix(const char *s, const char *suffix)
 
 /* has_suffix_c returns true if non-NULL string s ends with a c before the
  * terminating NUL. */
-bool has_suffix_c(const char *s, int c)
+bool
+has_suffix_c(const char *s, int c)
 {
     return *s && s[strlen(s) - 1] == c;
 }
@@ -384,7 +408,8 @@ bool has_suffix_c(const char *s, int c)
 
 /* trim_suffix_c 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 trim_suffix_c(char *s, int c)
+void
+trim_suffix_c(char *s, int c)
 {
     if (!*s)
         return;
@@ -396,7 +421,8 @@ void trim_suffix_c(char *s, int c)
 
 
 /* to_lower runs all of s through tolower(3). */
-void to_lower(char *s)
+void
+to_lower(char *s)
 {
     unsigned char *b;
 
@@ -406,7 +432,8 @@ void to_lower(char *s)
 
 
 /* to_upper runs all of s through toupper(3). */
-void to_upper(char *s)
+void
+to_upper(char *s)
 {
     unsigned char *b;
 
@@ -416,7 +443,8 @@ void to_upper(char *s)
 
 
 int
-nmh_init(const char *argv0, int read_context) {
+nmh_init(const char *argv0, bool read_context, bool check_version)
+{
     int status = OK;
     char *locale;
 
@@ -433,25 +461,25 @@ nmh_init(const char *argv0, int read_context) {
 
     /* Read context, if supposed to. */
     if (read_context) {
-        int allow_version_check = 1;
-        int check_older_version = 0;
         char *cp;
 
         context_read();
 
-        if (read_context != 1  ||
+        bool allow_version_check = true;
+        bool check_older_version = false;
+        if (!check_version ||
             ((cp = context_find ("Welcome")) && strcasecmp (cp, "disable") == 0)) {
-            allow_version_check = 0;
+            allow_version_check = false;
         } else if ((cp = getenv ("MHCONTEXT")) != NULL && *cp != '\0') {
             /* Context file comes from $MHCONTEXT, so only print the message
                if the context file has an older version.  If it does, or if it
                doesn't have a version at all, update the version. */
-            check_older_version = 1;
+            check_older_version = true;
         }
 
         /* Check to see if the user is running a different (or older, if
            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 so. */
         if (allow_version_check  &&  isatty (fileno (stdin))  &&
             isatty (fileno (stdout))  &&  isatty (fileno (stderr))) {
             if (nmh_version_changed (check_older_version)) {
@@ -498,7 +526,8 @@ nmh_init(const char *argv0, int read_context) {
  * use that prefix here.
  */
 int
-nmh_version_changed (int older) {
+nmh_version_changed (int older)
+{
     const char *const context_version = context_find("Version");
 
     if (older) {
@@ -530,7 +559,8 @@ nmh_version_changed (int older) {
  * isascii(3), i.e. is outside [0, 0x7f].  If start is NULL it returns
  * false.  Bytes are examined until a NUL byte, or, if end is not NULL,
  * whilst start is before end. */
-bool contains8bit(const char *start, const char *end)
+bool
+contains8bit(const char *start, const char *end)
 {
     const char *p;
     char c;
@@ -557,7 +587,8 @@ bool contains8bit(const char *start, const char *end)
  * See if input has any 8-bit bytes.
  */
 int
-scan_input (int fd, int *eightbit) {
+scan_input (int fd, int *eightbit)
+{
     int state;
     char buf[BUFSIZ];
 
@@ -579,7 +610,8 @@ scan_input (int fd, int *eightbit) {
  * Convert an int to a char string.
  */
 char *
-m_str(int value) {
+m_str(int value)
+{
     return m_strn(value, 0);
 }
 
@@ -592,7 +624,8 @@ m_str(int value) {
 #define SIZE(n) (sizeof STR(n))
 
 char *
-m_strn(int value, unsigned int width) {
+m_strn(int value, unsigned int width)
+{
     /* Need to include space for negative sign.  But don't use INT_MIN
        because it could be a macro that would fool SIZE(n). */
     static char buffer[SIZE(-INT_MAX)];