Expand the test of scan's -forma; fails on first attempt.

[nmh] / h / utils.h

diff --git a/h/utils.h b/h/utils.h
index 8142b2c3cf239c3e7fc090b468b881d461d8ac20..9e515989cf101ced93b944e033c9382f22c3ddec 100644 (file)
--- a/h/utils.h
+++ b/h/utils.h
@@ -5,17 +5,77 @@
 
 void *mh_xmalloc(size_t);
 void *mh_xrealloc(void *, size_t);
+void *mh_xcalloc(size_t, size_t);
 char *pwd(void);
-char *add(char *, char *);
-char *addlist(char *, char *);
-int folder_exists(char *);
+char *add(const char *, char *);
+char *addlist(char *, const char *);
+int folder_exists(const char *);
 void create_folder(char *, int, void (*)(int));
 int num_digits(int);
 
+/*
+ * A vector of char array, used to hold a list of string message numbers
+ * or command arguments.
+ */
+
 struct msgs_array {
        int max, size;
        char **msgs;
 };
 
+/*
+ * Same as msgs_array, but for a vector of ints
+ */
+
+struct msgnum_array {
+       int max, size;
+       int *msgnums;
+};
+
+/*
+ * Add a argument to the given msgs_array or msgnum_array structure; extend
+ * the array size if necessary
+ */
+
 void app_msgarg(struct msgs_array *, char *);
+void app_msgnum(struct msgnum_array *, int);
+
 int open_form(char **, char *);
+char *find_str (const char [], size_t, const char *);
+char *rfind_str (const char [], size_t, const char *);
+char *nmh_strcasestr (const char *, const char *);
+
+/*
+ * See if a string contains 8 bit characters (use isascii() for the test).
+ * Arguments include:
+ *
+ * start       - Pointer to start of string to test.
+ * end         - End of string to test (test will stop before reaching
+ *               this point).  If NULL, continue until reaching '\0'.
+ *
+ * This function always stops at '\0' regardless of the value of 'end'.
+ * Returns 1 if the string contains an 8-bit character, 0 if it does not.
+ */
+int contains8bit(const char *start, const char *end);
+
+/*
+ * See if file has any 8-bit bytes.
+ * Arguments include:
+ *
+ * fd          - file descriptor
+ * eightbit    - address of result, will be set to 1 if the file contains
+ *                any 8-bit bytes, 0 otherwise.
+ *
+ * Returns OK on success, NOTOK on read failure.
+ *
+ */
+int scan_input (int fd, int *eightbit);
+
+
+/*
+ * Compares prior version of nmh with current version.  Returns 1
+ * if they compare the be the same, 0 if not.
+ *
+ * older        - 0 for difference comparison, 1 for only if older
+ */
+int nmh_version_changed (int older);