Added scan and inc from mbox with multiple messages.

[nmh] / h / mh.h

diff --git a/h/mh.h b/h/mh.h
index e3a382a32334b69b68551d9ee9a9a02f5a798a3f..2cd546b11a03a8bafe5277ae1938171bdf2f6215 100644 (file)
--- a/h/mh.h
+++ b/h/mh.h
@@ -32,8 +32,10 @@ typedef unsigned char  boolean;  /* not int so we can pack in a structure */
  */
 #if __GNUC__ > 2
 #define NORETURN __attribute__((__noreturn__))
  */
 #if __GNUC__ > 2
 #define NORETURN __attribute__((__noreturn__))

+#define NMH_UNUSED(i) (void) i

 #else
 #define NORETURN
 #else
 #define NORETURN

+#define NMH_UNUSED(i) i

 #endif
 
 /*
 #endif
 
 /*


@@ -53,6 +55,11 @@ struct node {
 #define        UNKWNSW  (-1)   /* from smatch() on unknown switch   */
 
 struct swit {
 #define        UNKWNSW  (-1)   /* from smatch() on unknown switch   */
 
 struct swit {

+
+    /*
+     * Switch name
+     */
+

     char *sw;
 
     /* The minchars field is apparently used like this:
     char *sw;
 
     /* The minchars field is apparently used like this:


@@ -61,8 +68,54 @@ struct swit {
        0  : Switch can't be abbreviated;               switch shown in -help.
        #  : Switch can be abbreviated to # characters; switch shown in -help. */
     int minchars;
        0  : Switch can't be abbreviated;               switch shown in -help.
        #  : Switch can be abbreviated to # characters; switch shown in -help. */
     int minchars;

+
+    /*
+     * If we pick this switch, return this value from smatch
+     */
+
+    int swret;

 };
 
 };
 

+/*
+ * Macros to use when declaring struct swit arrays.
+ *
+ * These macros are what known as X-Macros.  In your source code you
+ * use them like this:
+ *
+ * #define FOO_SWITCHES \
+ *    X("switch1", 0, SWITCHSW) \
+ *    X("switch2", 0, SWITCH2SW) \
+ *    X("thirdswitch", 2, SWITCH3SW) \
+ *
+ * The argument to each entry in FOO_SWITCHES are the switch name (sw),
+ * the minchars field (see above) and the return value for this switch.
+ *
+ * After you define FOO_SWITCHES, you instantiate it as follows:
+ *
+ * #define X(sw, minchars, id) id,
+ * DEFINE_SWITCH_ENUM(FOO);
+ * #undef X
+ *
+ * #define X(sw, minchars, id) { sw, minchars, id },
+ * DEFINE_SWITCH_ARRAY(FOO);
+ * #undef X
+ *
+ * DEFINE_SWITCH_ENUM defines an extra enum at the end of the list called
+ * LEN_FOO.
+ */
+
+#define DEFINE_SWITCH_ENUM(name) \
+    enum { \
+       name ## _SWITCHES \
+       LEN_ ## name \
+    }
+
+#define DEFINE_SWITCH_ARRAY(name, array) \
+    static struct swit array[] = { \
+       name ## _SWITCHES \
+       { NULL, 0, 0 } \
+    }
+

 extern struct swit anoyes[];   /* standard yes/no switches */
 
 #define ATTACHFORMATS 3                /* Number of send attach formats. */
 extern struct swit anoyes[];   /* standard yes/no switches */
 
 #define ATTACHFORMATS 3                /* Number of send attach formats. */


@@ -264,6 +317,8 @@ extern char *msg_delim;             /*  .. */
 #define LINK   "@"             /* Name of link to file to which you are */
                                /* replying. */
 
 #define LINK   "@"             /* Name of link to file to which you are */
                                /* replying. */
 

+#define NMH_ATTACH_HEADER "Nmh-Attachment"  /* Default header for -attach */
+

 /*
  * miscellaneous macros
  */
 /*
  * miscellaneous macros
  */


@@ -294,6 +349,13 @@ extern char *defpath;              /* pathname of user's profile      */
 extern char *ctxpath;          /* pathname of user's context      */
 extern struct node *m_defs;    /* list of profile/context entries */
 
 extern char *ctxpath;          /* pathname of user's context      */
 extern struct node *m_defs;    /* list of profile/context entries */
 

+/* What style to use for generated Message-ID and Content-ID header
+   fields.  The localname style is pid.time@localname, where time is
+   in seconds.  The random style replaces the localname with some
+   (pseudo)random bytes and uses microsecond-resolution time. */
+int save_message_id_style (const char *);
+char *message_id (time_t, int);
+

 /*
  * These standard strings are defined in config.c.  They are the
  * only system-dependent parameters in nmh, and thus by redefining
 /*
  * These standard strings are defined in config.c.  They are the
  * only system-dependent parameters in nmh, and thus by redefining


@@ -305,14 +367,13 @@ extern char *catproc;
 extern char *components;
 extern char *context;
 extern char *current;
 extern char *components;
 extern char *context;
 extern char *current;

-extern char *defaulteditor;

 extern char *defaultfolder;
 extern char *digestcomps;
 extern char *distcomps;
 extern char *draft;
 extern char *defaultfolder;
 extern char *digestcomps;
 extern char *distcomps;
 extern char *draft;

-extern char *faceproc;

 extern char *fileproc;
 extern char *foldprot;
 extern char *fileproc;
 extern char *foldprot;

+extern char *formatproc;

 extern char *forwcomps;
 extern char *inbox;
 extern char *incproc;
 extern char *forwcomps;
 extern char *inbox;
 extern char *incproc;


@@ -342,7 +403,6 @@ extern char *rcvdistcomps;
 extern char *rcvstoreproc;
 extern char *replcomps;
 extern char *replgroupcomps;
 extern char *rcvstoreproc;
 extern char *replcomps;
 extern char *replgroupcomps;

-extern char *rmfproc;

 extern char *rmmproc;
 extern char *sendproc;
 extern char *showmimeproc;
 extern char *rmmproc;
 extern char *sendproc;
 extern char *showmimeproc;