X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=h%2Fmh.h;h=53b301e5692a1c67fdf39ed2196259f7c86cc1aa;hp=f3fda88083c4c4d9b42408e10880c83c568c6bb4;hb=ee8d01d64e8832304256de53db07228e2be67f6a;hpb=0347722f5b69de06a867b73ddc23388d082ab219

diff --git a/h/mh.h b/h/mh.h
index f3fda88..53b301e 100644
--- a/h/mh.h
+++ b/h/mh.h
@@ -2,7 +2,14 @@
 ** mh.h -- main header file for all of nmh
 */
 
-#include <h/nmh.h>
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <stdarg.h>
+
 
 /*
 ** Well-used constants
@@ -36,6 +43,30 @@ typedef unsigned char  boolean;  /* not int so we can pack in a structure */
 #endif
 
 /*
+** we should be getting this value from pathconf(_PC_PATH_MAX)
+*/
+#ifndef PATH_MAX
+# ifdef MAXPATHLEN
+#  define PATH_MAX MAXPATHLEN
+# else
+   /* so we will just pick something */
+#  define PATH_MAX 1024
+# endif
+#endif
+
+/*
+** we should be getting this value from sysconf(_SC_OPEN_MAX)
+*/
+#ifndef OPEN_MAX
+# ifdef NOFILE
+#  define OPEN_MAX NOFILE
+# else
+   /* so we will just pick something */
+#  define OPEN_MAX 64
+# endif
+#endif
+
+/*
 ** user context/profile structure
 */
 struct node {
@@ -172,16 +203,24 @@ struct msgs {
                            ** terminating NULL.
                            */
 
-#define LENERR   (-2)      /* Name too long error from getfld  */
-#define FMTERR   (-3)      /* Message Format error             */
-#define FLD      0         /* Field returned                   */
-#define FLDPLUS  1         /* Field returned with more to come */
-#define FLDEOF   2         /* Field returned ending at eom     */
-#define BODY     3         /* Body  returned with more to come */
-#define BODYEOF  4         /* Body  returned ending at eom     */
-#define FILEEOF  5         /* Reached end of input file        */
+/* m_getfld2() returned data */
+struct field {
+	char name[NAMESZ];
+	size_t namelen;
+	char *value;
+	size_t valuelen;
+	size_t alloclen;
+};
 
-extern int msg_count;        /* m_getfld() indicators (That's a hack!) */
+/* m_getfld2() states */
+enum state {
+	LENERR2 = -2,      /* Line too long */
+	FMTERR2 = -3,      /* Format error in message */
+	IOERR2 = -1,       /* Read error */
+	FLD2 = 0,          /* Header field returned */
+	BODY2,             /* Body line returned */
+	FILEEOF2,          /* Reached end of input file */
+};
 
 #define NOUSE    0        /* draft being re-used */
 
@@ -191,8 +230,6 @@ extern int msg_count;        /* m_getfld() indicators (That's a hack!) */
 ** miscellaneous macros
 */
 
-#define pidXwait(pid,cp) pidstatus(pidwait(pid, NOTOK), stdout, cp)
-
 #ifndef max
 # define max(a,b) ((a) > (b) ? (a) : (b))
 #endif
@@ -254,6 +291,7 @@ extern char *psequence;
 extern char *rcvdistcomps;
 extern char *replcomps;
 extern char *replgroupcomps;
+extern char *scanformat;
 extern char *sendmail;
 extern char *seq_all;
 extern char *seq_beyond;
@@ -266,10 +304,8 @@ extern char *seq_unseen;
 extern char *seq_neg;
 extern char *trashfolder;
 extern char *usequence;
-extern char *version_num;
-extern char *version_str;
+extern char *version;
+extern char *lib_version;
 extern char *whatnowproc;
 
-extern void (*done) (int) NORETURN;
-
 #include <h/prototypes.h>