Remove unused NCWD and NPWD #defines.

[nmh] / h / utils.h

diff --git a/h/utils.h b/h/utils.h
index 52d7d05b3bcf708a59021b6d0a5fec003a6641e6..c8384b3921dd7981db70359c80bc8204b3e8c2ef 100644 (file)
--- a/h/utils.h
+++ b/h/utils.h
@@ -3,9 +3,27 @@
  * utils.h -- utility prototypes
  */
 
  * utils.h -- utility prototypes
  */
 

-void *mh_xmalloc(size_t);
-void *mh_xrealloc(void *, size_t);
-void *mh_xcalloc(size_t, size_t);
+/* Call malloc(3), exiting on NULL return. */
+void *mh_xmalloc(size_t size);
+
+/* Call realloc(3), exiting on NULL return. */
+void *mh_xrealloc(void *ptr, size_t size);
+
+/* Call calloc(3), exiting on NULL return. */
+void *mh_xcalloc(size_t nelem, size_t elsize);
+
+/* Duplicate a NUL-terminated string, exit on failure. */
+char *mh_xstrdup(const char *src);
+
+/* Call free(3), if ptr isn't NULL. */
+void mh_xfree(void *ptr);
+
+/* Set p to point to newly allocated, uninitialised, memory. */
+#define NEW(p) ((p) = mh_xmalloc(sizeof *(p)))
+
+/* Set p to point to newly allocated, zeroed, memory. */
+#define NEW0(p) ((p) = mh_xcalloc(1, sizeof *(p)))
+

 char *pwd(void);
 char *add(const char *, char *);
 char *addlist(char *, const char *);
 char *pwd(void);
 char *add(const char *, char *);
 char *addlist(char *, const char *);


@@ -45,6 +63,12 @@ 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 *);
 
 char *rfind_str (const char [], size_t, const char *);
 char *nmh_strcasestr (const char *, const char *);
 

+bool HasPrefix(const char *s, const char *prefix);
+bool HasSuffixC(const char *s, int c);
+void TrimSuffixC(char *s, int c);
+void ToLower(char *s);
+void ToUpper(char *s);
+

 /*
  * See if a string contains 8 bit characters (use isascii() for the test).
  * Arguments include:
 /*
  * See if a string contains 8 bit characters (use isascii() for the test).
  * Arguments include:


@@ -59,9 +83,23 @@ char *nmh_strcasestr (const char *, const char *);
 int contains8bit(const char *start, const char *end);
 
 /*
 int contains8bit(const char *start, const char *end);
 
 /*

- * Check to see if the user is running a different version of nmh
- * than they had last run, and notify them if so.  But only if
- * they seem to be running an interactive program.
- * Returns 1 if they are, 0 if they are not.
+ * 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 nmh_version_changed (int older);