uip: Replace some ints that are only ever 0 or 1 with bool.

[nmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index 205c859240ed690c1b1c09cdcf30977d220f1117..2d0acb3947eaeda9623cd15a7a83c414a194ae85 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -12,6 +12,7 @@
 #include "makedir.h"
 #include <fcntl.h>
 #include <limits.h>
 #include "makedir.h"
 #include <fcntl.h>
 #include <limits.h>

+#include "read_line.h"

 
 extern char *mhdocdir;
 
 
 extern char *mhdocdir;
 


@@ -35,7 +36,7 @@ void *mh_xmalloc(size_t size)
         size = 1; /* Some mallocs don't like 0. */
     p = malloc(size);
     if (!p)
         size = 1; /* Some mallocs don't like 0. */
     p = malloc(size);
     if (!p)

-        adios(NULL, "malloc failed, size wanted: %lu", (unsigned long)size);
+        die("malloc failed, size wanted: %zu", size);

 
     return p;
 }
 
     return p;
 }


@@ -47,7 +48,7 @@ void *mh_xrealloc(void *ptr, size_t size)
 
     /* Copy POSIX behaviour, coping with non-POSIX systems. */
     if (size == 0) {
 
     /* Copy POSIX behaviour, coping with non-POSIX systems. */
     if (size == 0) {

-        mh_xfree(ptr);
+        free(ptr);

         return mh_xmalloc(1); /* Get a unique pointer. */
     }
     if (!ptr)
         return mh_xmalloc(1); /* Get a unique pointer. */
     }
     if (!ptr)


@@ -55,7 +56,7 @@ void *mh_xrealloc(void *ptr, size_t size)
 
     new = realloc(ptr, size);
     if (!new)
 
     new = realloc(ptr, size);
     if (!new)

-        adios(NULL, "realloc failed, size wanted: %lu", (unsigned long)size);
+        die("realloc failed, size wanted: %zu", size);

 
     return new;
 }
 
     return new;
 }


@@ -70,8 +71,7 @@ void *mh_xcalloc(size_t nelem, size_t elsize)
 
     p = calloc(nelem, elsize);
     if (!p)
 
     p = calloc(nelem, elsize);
     if (!p)

-        adios(NULL, "calloc failed, size wanted: %lu * %lu",
-            (unsigned long)nelem, (unsigned long)elsize);
+        die("calloc failed, size wanted: %zu * %zu", nelem, elsize);

 
     return p;
 }
 
     return p;
 }


@@ -89,13 +89,6 @@ char *mh_xstrdup(const char *src)
     return dest;
 }
 
     return dest;
 }
 

-/* Call free(3), if ptr isn't NULL. */
-void mh_xfree(void *ptr)
-{
-    if (ptr)
-        free(ptr); /* Some very old platforms can't cope with NULL. */
-}
-

 /*
  * Return the present working directory, if the current directory does not
  * exist, or is too long, make / the pwd.
 /*
  * Return the present working directory, if the current directory does not
  * exist, or is too long, make / the pwd.


@@ -124,13 +117,15 @@ pwd(void)
     return curwd;
 }
 
     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)
  */
 char *
 add (const char *s2, char *s1)


@@ -210,7 +205,7 @@ void create_folder(char *folder, int autocreate, void (*done_callback)(int))
             done_callback (1);
         }
         if (!makedir (folder))
             done_callback (1);
         }
         if (!makedir (folder))

-            adios (NULL, "unable to create folder %s", folder);
+            die("unable to create folder %s", folder);

     }
 }
 
     }
 }
 


@@ -225,7 +220,7 @@ num_digits (int n)
 
     /* Sanity check */
     if (n < 0)
 
     /* 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;
 
     if (n == 0)
         return 1;


@@ -422,8 +417,8 @@ void to_upper(char *s)
 }
 
 
 }
 
 

-int
-nmh_init(const char *argv0, int read_context) {
+int nmh_init(const char *argv0, bool read_context, bool check_version)
+{

     int status = OK;
     char *locale;
 
     int status = OK;
     char *locale;
 


@@ -440,25 +435,25 @@ nmh_init(const char *argv0, int read_context) {
 
     /* Read context, if supposed to. */
     if (read_context) {
 
     /* Read context, if supposed to. */
     if (read_context) {

-        int allow_version_check = 1;
-        int check_older_version = 0;

         char *cp;
 
         context_read();
 
         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)) {
             ((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. */
         } 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
         }
 
         /* 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)) {
         if (allow_version_check  &&  isatty (fileno (stdin))  &&
             isatty (fileno (stdout))  &&  isatty (fileno (stderr))) {
             if (nmh_version_changed (check_older_version)) {


@@ -533,24 +528,30 @@ nmh_version_changed (int older) {
 }
 
 
 }
 
 

-/*
- * Scan for any 8-bit characters.  Return 1 if they exist.
- *
- * Scan up until the given endpoint (but not the actual endpoint itself).
- * If the endpoint is NULL, scan until a '\0' is reached.
- */
-
-int
-contains8bit(const char *start, const char *end)
+/* contains8bit returns true if any byte from start onwards fails
+ * 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)

 {
 {

-    if (! start)
-       return 0;
+    const char *p;
+    char c;

 
 

-    while (*start != '\0' && (!end || (start < end)))
-       if (! isascii((unsigned char) *start++))
-           return 1;
+    if (!start)
+        return false;

 
 

-    return 0;
+    p = start;
+    if (end) {
+        while (p < end && (c = (*p++)))
+            if (!isascii((unsigned char)c))
+                return true;
+    } else {
+        while ((c = (*p++)))
+            if (!isascii((unsigned char)c))
+                return true;
+    }
+
+    return false;

 }
 
 
 }