Added context_find_prefix().

[nmh] / uip / mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 96b99b794787de5e379cb333826cfe35bbd068dd..b2a4c0da5736b7153c2cc9f692b753b932031383 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -31,9 +31,13 @@
     X("noinlineonly", 0, NINLINESW) \
     X("file file", 0, FILESW) \
     X("form formfile", 0, FORMSW) \
+    X("header", 0, HEADSW) \
+    X("noheader", 0, NHEADSW) \
+    X("headerform formfile", 0, HEADFORMSW) \
     X("markform formfile", 0, MARKFORMSW) \
     X("part number", 0, PARTSW) \
     X("type content", 0, TYPESW) \
+    X("prefer content", 0, PREFERSW) \
     X("rcache policy", 0, RCACHESW) \
     X("wcache policy", 0, WCACHESW) \
     X("version", 0, VERSIONSW) \
@@ -69,6 +73,10 @@ extern char *cache_private;
 extern char *progsw;
 extern int nomore;     /* flags for moreproc/header display */
 extern char *formsw;
+extern char *folder;
+extern char *headerform;
+extern char *markerform;
+extern int headersw;
 
 /* mhmisc.c */
 extern int npart;
@@ -77,6 +85,11 @@ extern char *parts[NPARTS + 1];
 extern char *types[NTYPES + 1];
 extern int userrs;
 
+/* mhparse.c */
+extern char *preferred_types[];
+extern  char *preferred_subtypes[];
+extern int npreferred;
+
 int debugsw = 0;
 int verbosw = 0;
 
@@ -86,7 +99,7 @@ int verbosw = 0;
 CT parse_mime (char *);
 
 /* mhmisc.c */
-int part_ok (CT, int);
+int part_ok (CT);
 int type_ok (CT, int);
 void flush_errors (void);
 
@@ -104,7 +117,7 @@ int
 main (int argc, char **argv)
 {
     int msgnum, *icachesw, concatsw = -1, textonly = -1, inlineonly = -1;
-    char *cp, *file = NULL, *folder = NULL, *markform = NULL;
+    char *cp, *file = NULL;
     char *maildir, buf[100], **argp;
     char **arguments;
     struct msgs_array msgs = { 0, 0, NULL };
@@ -125,13 +138,13 @@ main (int argc, char **argv)
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {
-           case AMBIGSW: 
+           case AMBIGSW:
                ambigsw (cp, switches);
                done (1);
-           case UNKWNSW: 
+           case UNKWNSW:
                adios (NULL, "-%s unknown", cp);
 
-           case HELPSW: 
+           case HELPSW:
                snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                        invo_name);
                print_help (buf, switches, 1);
@@ -182,7 +195,7 @@ do_cache:
                inlineonly = 1;
                continue;
            case NINLINESW:
-               inlineonly = 1;
+               inlineonly = 0;
                continue;
 
            case PARTSW:
@@ -203,6 +216,18 @@ do_cache:
                types[ntype++] = cp;
                continue;
 
+           case PREFERSW:
+               if (!(cp = *argp++) || *cp == '-')
+                   adios (NULL, "missing argument to %s", argp[-2]);
+               if (npreferred >= NPREFS)
+                   adios (NULL, "too many preferred types (starting with %s), %d max",
+                          cp, NPREFS);
+               preferred_types[npreferred] = cp;
+               cp = strchr(cp, '/');
+               if (cp) *cp++ = '\0';
+               preferred_subtypes[npreferred++] = cp;
+               continue;
+
            case FILESW:
                if (!(cp = *argp++) || (*cp == '-' && cp[1]))
                    adios (NULL, "missing argument to %s", argp[-2]);
@@ -217,8 +242,20 @@ do_cache:
                formsw = getcpy (etcpath (cp));
                continue;
 
+           case HEADSW:
+               headersw = 1;
+               continue;
+           case NHEADSW:
+               headersw = 0;
+               continue;
+
+           case HEADFORMSW:
+               if (!(headerform = *argp++) || *headerform == '-')
+                   adios (NULL, "missing argument to %s", argp[-2]);
+               continue;
+
            case MARKFORMSW:
-               if (!(markform = *argp++) || *markform == '-')
+               if (!(markerform = *argp++) || *markerform == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                continue;
 
@@ -239,10 +276,10 @@ do_cache:
                    adios (NULL, "missing argument to %s", argp[-2]);
                continue;
 
-           case VERBSW: 
+           case VERBSW:
                verbosw = 1;
                continue;
-           case NVERBSW: 
+           case NVERBSW:
                verbosw = 0;
                continue;
            case DEBUGSW:
@@ -314,12 +351,14 @@ do_cache:
      * check if message is coming from file
      */
     if (file) {
-       if (!(cts = (CT *) calloc ((size_t) 2, sizeof(*cts))))
+       if (!(cts = (CT *) mh_xcalloc ((size_t) 2, sizeof(*cts))))
            adios (NULL, "out of memory");
        ctp = cts;
 
        if ((ct = parse_mime (file)))
            *ctp++ = ct;
+
+       headersw = 0;
     } else {
        /*
         * message(s) are coming from a folder
@@ -358,7 +397,7 @@ do_cache:
        seq_setprev (mp);       /* set the Previous-Sequence */
        seq_setunseen (mp, 1);  /* unset the Unseen-Sequence */
 
-       if (!(cts = (CT *) calloc ((size_t) (mp->numsel + 1), sizeof(*cts))))
+       if (!(cts = (CT *) mh_xcalloc ((size_t) (mp->numsel + 1), sizeof(*cts))))
            adios (NULL, "out of memory");
        ctp = cts;
 
@@ -412,7 +451,7 @@ do_cache:
     /*
      * Show the message content
      */
-    show_all_messages (cts, concatsw, textonly, inlineonly, markform);
+    show_all_messages (cts, concatsw, textonly, inlineonly);
 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)