make scan_content() work correctly with content containing NULs

[nmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index 8162056796d1a57fa368fdcac27b67276a090e37..4405f4c95a5c52d5cf406d52cc95535479b71781 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -9,9 +9,14 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
-#include <stdlib.h>
 #include <fcntl.h>
-#include <errno.h>
+
+/* sbr/signals.c */
+extern int setup_signal_handlers();
+
+/* sbr/m_mktemp.c */
+extern void remove_registered_files_atexit();
+
 
 /*
  * We allocate space for messages (msgs array)
@@ -319,3 +324,65 @@ nmh_strcasestr (const char *s1, const char *s2) {
 
     return NULL;
 }
+
+
+int
+nmh_init(const char *argv0, int read_context) {
+    setlocale(LC_ALL, "");
+
+    invo_name = r1bindex ((char *) argv0, '/');
+
+    if (setup_signal_handlers()) {
+        admonish("sigaction", "unable to set up signal handlers");
+    }
+
+    /* POSIX atexit() does not define any error conditions. */
+    if (atexit(remove_registered_files_atexit)) {
+        admonish("atexit", "unable to register atexit function");
+    }
+
+    if (read_context) {
+        context_read();
+        return OK;
+    } else {
+        int status = context_foil(NULL);
+        if (status != OK) {
+            advise("", "failed to create minimal profile/conext");
+        }
+        return status;
+    }
+}
+
+
+/* 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);
+    char *cp;
+
+    for (cp = up; *cp; ++cp) { *cp = toupper ((unsigned char) *cp); }
+
+    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)
+{
+    if (! start)
+       return 0;
+
+    while (*start != '\0' && (!end || (start < end)))
+       if (! isascii((unsigned char) *start++))
+           return 1;
+
+    return 0;
+}