Added support for %{charset} display string escape to mhshow(1).

[nmh] / h / nmh.h

diff --git a/h/nmh.h b/h/nmh.h
index 17e4273f682622de277e483fe2a63cd6847167d2..ca32f58b738b762d5d704f611e407a825d8b94a7 100644 (file)
--- a/h/nmh.h
+++ b/h/nmh.h
@@ -10,7 +10,13 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <ctype.h>
+#ifndef NDEBUG
+  /* See etc/gen-ctype-checked.c. */
+# include <sbr/ctype-checked.h>
+#endif
+#include <assert.h>
 #include <sys/stat.h>
+#include <sys/wait.h>
 
 # include <dirent.h>
 #define NLENGTH(dirent) strlen((dirent)->d_name)
@@ -23,8 +29,9 @@
 # include <sys/param.h>
 #endif
 
-# include <locale.h>
-# include <limits.h>
+#include <locale.h>
+#include <limits.h>
+#include <errno.h>
 
 /*
  * we should be getting this value from pathconf(_PC_PATH_MAX)
@@ -61,9 +68,11 @@
 # endif
 #endif
 
+/*
+ * Defaults for programs if they aren't configured in a user's profile
+ */
+
+#define DEFAULT_PAGER "more"
+#define DEFAULT_EDITOR "vi"
+
 #include <signal.h>
- 
-#define bcmp(b1,b2,length)      memcmp(b1, b2, length)
-#define bcopy(b1,b2,length)     memcpy (b2, b1, length)
-#define bcpy(b1,b2,length)      memcmp (b1, b2, length)
-#define bzero(b,length)         memset (b, 0, length)