Fix mhsign for gpg2: Expiry date format

[mmh] / h / mh.h

diff --git a/h/mh.h b/h/mh.h
index 17d5c2f..53b301e 100644 (file)
--- a/h/mh.h
+++ b/h/mh.h
@@ -4,23 +4,12 @@
 
 #include <config.h>
 
-#include <unistd.h>
 #include <stdio.h>
-#include <ctype.h>
-#include <sys/stat.h>
-
-#include <dirent.h>
-
 #include <stdlib.h>
-#include <stdarg.h>
 #include <string.h>
+#include <sys/types.h>
+#include <stdarg.h>
 
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
-
-#include <locale.h>
-#include <limits.h>
 
 /*
 ** Well-used constants
@@ -214,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 */
 
@@ -294,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;
@@ -306,8 +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;
 
 #include <h/prototypes.h>