send.c, whatnowsbr.c: Delete option variables set but never read.

[nmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index aa344b99acab505e6f6820c023d7a803553ee5c1..2d0acb3947eaeda9623cd15a7a83c414a194ae85 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -7,16 +7,20 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
 
 #include <h/mh.h>
 #include <h/utils.h>

+#include <h/signals.h>
+#include "m_mktemp.h"
+#include "makedir.h"

 #include <fcntl.h>
 #include <fcntl.h>

-
-/* sbr/signals.c */
-extern int setup_signal_handlers();
-
-/* sbr/m_mktemp.c */
-extern void remove_registered_files_atexit();
+#include <limits.h>
+#include "read_line.h"

 
 extern char *mhdocdir;
 
 
 extern char *mhdocdir;
 

+/* plurals gives the letter ess to indicate a plural noun, or an empty
+ * string as plurals+1 for the singular noun.  Used by the PLURALS
+ * macro. */
+const char plurals[] = "s";
+

 /*
  * We allocate space for messages (msgs array)
  * this number of elements at a time.
 /*
  * We allocate space for messages (msgs array)
  * this number of elements at a time.


@@ -32,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: %zu", size);
+        die("malloc failed, size wanted: %zu", size);

 
     return p;
 }
 
     return p;
 }


@@ -44,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)


@@ -52,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: %zu", size);
+        die("realloc failed, size wanted: %zu", size);

 
     return new;
 }
 
     return new;
 }


@@ -67,7 +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: %zu * %zu", nelem, elsize);
+        die("calloc failed, size wanted: %zu * %zu", nelem, elsize);

 
     return p;
 }
 
     return p;
 }


@@ -85,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.


@@ -120,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)


@@ -206,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);

     }
 }
 
     }
 }
 


@@ -221,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;


@@ -265,22 +264,6 @@ app_msgnum(struct msgnum_array *msgs, int msgnum)
        msgs->msgnums[msgs->size++] = msgnum;
 }
 
        msgs->msgnums[msgs->size++] = msgnum;
 }
 

-/* Open a form or components file */
-int
-open_form(char **form, char *def)
-{
-       int in;
-       if (*form) {
-               if ((in = open (etcpath (*form), O_RDONLY)) == NOTOK)
-                       adios (*form, "unable to open form file");
-       } else {
-               if ((in = open (etcpath (def), O_RDONLY)) == NOTOK)
-                       adios (def, "unable to open default components file");
-               *form = def;
-       }
-       return in;
-}
-

 
 /*
  * Finds first occurrence of str in buf.  buf is not a C string but a
 
 /*
  * Finds first occurrence of str in buf.  buf is not a C string but a


@@ -434,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;
 


@@ -452,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,7 +516,7 @@ nmh_version_changed (int older) {
             context_replace ("Version", "nmh-" VERSION);
         }
 
             context_replace ("Version", "nmh-" VERSION);
         }
 

-        return old_version < current_version  ?  1  :  0;
+        return old_version < current_version;

     }
 
     if (context_version == NULL  ||  strcmp(context_version, "nmh-" VERSION) != 0) {
     }
 
     if (context_version == NULL  ||  strcmp(context_version, "nmh-" VERSION) != 0) {


@@ -545,36 +528,30 @@ nmh_version_changed (int older) {
 }
 
 
 }
 
 

-/* 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);
-
-    to_upper(up);
-
-    return up;
-}
-
-
-/*
- * 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;

 }
 
 
 }
 
 


@@ -587,7 +564,7 @@ scan_input (int fd, int *eightbit) {
     char buf[BUFSIZ];
 
     *eightbit = 0;
     char buf[BUFSIZ];
 
     *eightbit = 0;

-    lseek (fd, (off_t) 0, SEEK_SET);
+    lseek(fd, 0, SEEK_SET);

 
     while ((state = read (fd, buf, sizeof buf)) > 0) {
         if (contains8bit (buf, buf + state)) {
 
     while ((state = read (fd, buf, sizeof buf)) > 0) {
         if (contains8bit (buf, buf + state)) {


@@ -598,3 +575,32 @@ scan_input (int fd, int *eightbit) {
 
     return state == NOTOK  ?  NOTOK  :  OK;
 }
 
     return state == NOTOK  ?  NOTOK  :  OK;
 }

+
+
+/*
+ * Convert an int to a char string.
+ */
+char *
+m_str(int value) {
+    return m_strn(value, 0);
+}
+
+
+/*
+ * Convert an int to a char string, of limited width if > 0.
+ */
+#define STR(s) #s
+/* SIZE(n) includes NUL.  n must just be digits, not an equation. */
+#define SIZE(n) (sizeof STR(n))
+
+char *
+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)];
+    const int num_chars = snprintf(buffer, sizeof buffer, "%d", value);
+
+    return num_chars > 0  &&  (width == 0 || (unsigned int) num_chars <= width)
+        ? buffer
+        : "?";
+}