X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=h%2Fmh.h;h=e1795caa1b681466ada5b4f6af22ee41d6c2a0ae;hp=053005103fd039e114a2969a0e924dd21572a4d7;hb=31750e8a12eafcd1b8fa81cb12b988e680254f24;hpb=412b2e54251ff6e20537f83b95c8ee76ea8c5c40

diff --git a/h/mh.h b/h/mh.h
index 0530051..e1795ca 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 {
@@ -154,55 +185,6 @@ struct msgs {
 */
 #define MSGSTATSIZE(mp,lo,hi) ((size_t) (((hi) - (lo) + 1) * sizeof(*(mp)->msgstats)))
 
-/*
-** macros for message and sequence manipulation
-*/
-#define clear_msg_flags(mp,msgnum) ((mp)->msgstats[(msgnum) - mp->lowoff] = 0)
-#define copy_msg_flags(mp,i,j) \
-    ((mp)->msgstats[(i) - mp->lowoff] = (mp)->msgstats[(j) - mp->lowoff])
-#define get_msg_flags(mp,ptr,msgnum)  (*(ptr) = (mp)->msgstats[(msgnum) - mp->lowoff])
-#define set_msg_flags(mp,ptr,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] = *(ptr))
-
-#define does_exist(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] & EXISTS)
-#define unset_exists(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] &= ~EXISTS)
-#define set_exists(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] |= EXISTS)
-
-#define is_selected(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] & SELECTED)
-#define unset_selected(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] &= ~SELECTED)
-#define set_selected(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] |= SELECTED)
-
-#define is_unseen(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] & SELECT_UNSEEN)
-#define unset_unseen(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] &= ~SELECT_UNSEEN)
-#define set_unseen(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] |= SELECT_UNSEEN)
-
-
-#define in_sequence(mp,seqnum,msgnum) \
-           ((mp)->msgstats[(msgnum) - mp->lowoff] & (1 << (FFATTRSLOT + seqnum)))
-#define clear_sequence(mp,seqnum,msgnum) \
-           ((mp)->msgstats[(msgnum) - mp->lowoff] &= ~(1 << (FFATTRSLOT + seqnum)))
-#define add_sequence(mp,seqnum,msgnum) \
-           ((mp)->msgstats[(msgnum) - mp->lowoff] |= (1 << (FFATTRSLOT + seqnum)))
-
-#define is_seq_private(mp,seqnum) \
-           ((mp)->attrstats & (1 << (FFATTRSLOT + seqnum)))
-#define make_seq_public(mp,seqnum) \
-           ((mp)->attrstats &= ~(1 << (FFATTRSLOT + seqnum)))
-#define make_seq_private(mp,seqnum) \
-           ((mp)->attrstats |= (1 << (FFATTRSLOT + seqnum)))
-#define make_all_public(mp) \
-           ((mp)->attrstats = 0)
-
-/*
-** macros for folder attributes
-*/
-#define clear_folder_flags(mp) ((mp)->msgflags = 0)
-
-#define is_readonly(mp)  ((mp)->msgflags & READONLY)
-#define set_readonly(mp)  ((mp)->msgflags |= READONLY)
-
-#define other_files(mp)  ((mp)->msgflags & OTHERS)
-#define set_other_files(mp)  ((mp)->msgflags |= OTHERS)
-
 #define NULLMP  ((struct msgs *) 0)
 
 /*
@@ -221,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 */
 
@@ -240,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
@@ -273,8 +261,8 @@ extern char *mailstore;      /* name of mail storage directory  */
 ** on any system.
 */
 extern char *attach_hdr;
-extern char *backup_prefix;
-extern char *altmsglink;
+extern char *sign_hdr;
+extern char *enc_hdr;
 extern char *components;
 extern char *context;
 extern char *curfolder;
@@ -296,16 +284,14 @@ extern char *mhlreply;
 extern char *mimetypequery;
 extern char *mimetypequeryproc;
 extern char *msgprot;
-extern char *nmhaccessftp;
 extern char *nmhstorage;
-extern char *nmhcache;
-extern char *nmhprivcache;
 extern char *nsequence;
 extern char *profile;
 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;
@@ -322,6 +308,4 @@ extern char *version_num;
 extern char *version_str;
 extern char *whatnowproc;
 
-extern void (*done) (int) NORETURN;
-
 #include <h/prototypes.h>