Defined show(mime)proc locally and removed their profile entries.

[mmh] / uip / mhparam.c

diff --git a/uip/mhparam.c b/uip/mhparam.c
index 5bbd9fc..4cad041 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -11,9 +11,6 @@
 
 #include <h/mh.h>
 
-extern char *mhlibdir;
-extern char *mhetcdir;
-
 static struct swit switches[] = {
 #define COMPSW  0
        { "components", 0 },
@@ -36,36 +33,29 @@ struct proc {
 };
 
 static struct proc procs [] = {
-        { "context",       &context },
-        { "mh-sequences",  &mh_seq },
-        { "buildmimeproc", &buildmimeproc },
-        { "editor",        &defaulteditor },
-        { "faceproc",      &faceproc },
-        { "fileproc",      &fileproc },
-        { "foldprot",      &foldprot },
-        { "incproc",       &incproc },
-        { "installproc",   &installproc  },
-        { "lproc",         &lproc },
-        { "mailproc",      &mailproc },
-        { "mhlproc",       &mhlproc },
-        { "moreproc",      &moreproc },
-        { "msgprot",       &msgprot },
-        { "packproc",      &packproc },
-        { "postproc",      &postproc },
-        { "rmfproc",       &rmfproc },
-        { "rmmproc",       &rmmproc },
-        { "sendmail",      &sendmail },
-        { "sendproc",      &sendproc },
-        { "showmimeproc",  &showmimeproc },
-        { "showproc",      &showproc },
-        { "version",       &version_num },
-        { "whatnowproc",   &whatnowproc },
-        { "etcdir",        &mhetcdir },
-        { "libdir",        &mhlibdir },
-        { "backup-prefix", &backup_prefix },
-        { "altmsg-link",   &altmsglink },
-        { "draft-folder",  &draftfolder },
-        { NULL,            NULL },
+       { "attachment-header",  &attach_hdr },
+       { "context",       &context },
+       { "mh-sequences",  &mh_seq },
+       { "editor",        &defaulteditor },
+       { "fileproc",      &fileproc },
+       { "foldprot",      &foldprot },
+       { "listproc",      &listproc },
+       { "mailproc",      &mailproc },
+       { "mhlproc",       &mhlproc },
+       { "mimetypequeryproc", &mimetypequeryproc },
+       { "msgprot",       &msgprot },
+       { "pager",         &defaultpager },
+       { "postproc",      &postproc },
+       { "rmmproc",       &rmmproc },
+       { "sendmail",      &sendmail },
+       { "sendproc",      &sendproc },
+       { "version",       &version_num },
+       { "whatnowproc",   &whatnowproc },
+       { "etcdir",        &mhetcdir },
+       { "backup-prefix", &backup_prefix },
+       { "altmsg-link",   &altmsglink },
+       { "draft-folder",  &draftfolder },
+       { NULL,            NULL },
 };
 
 
@@ -95,34 +85,34 @@ main(int argc, char **argv)
        while ((cp = *argp++)) {
                if (*cp == '-') {
                        switch (smatch(++cp, switches)) {
-                               case AMBIGSW:
-                                       ambigsw(cp, switches);
-                                       done(1);
-                               case UNKWNSW:
-                                       adios(NULL, "-%s unknown", cp);
-
-                               case HELPSW:
-                                       snprintf(buf, sizeof(buf), "%s [profile-components] [switches]", invo_name);
-                                       print_help(buf, switches, 1);
-                                       done(1);
-                               case VERSIONSW:
-                                       print_version(invo_name);
-                                       done(1);
-
-                               case COMPSW:
-                                       components = 1;
-                                       break;
-                               case NCOMPSW:
-                                       components = 0;
-                                       break;
-
-                               case ALLSW:
-                                       all = 1;
-                                       break;
-
-                               case DEBUGSW:
-                                       debug = 1;
-                                       break;
+                       case AMBIGSW:
+                               ambigsw(cp, switches);
+                               done(1);
+                       case UNKWNSW:
+                               adios(NULL, "-%s unknown", cp);
+
+                       case HELPSW:
+                               snprintf(buf, sizeof(buf), "%s [profile-components] [switches]", invo_name);
+                               print_help(buf, switches, 1);
+                               done(1);
+                       case VERSIONSW:
+                               print_version(invo_name);
+                               done(1);
+
+                       case COMPSW:
+                               components = 1;
+                               break;
+                       case NCOMPSW:
+                               components = 0;
+                               break;
+
+                       case ALLSW:
+                               all = 1;
+                               break;
+
+                       case DEBUGSW:
+                               debug = 1;
+                               break;
                        }
                } else {
                        comps[compp++] = cp;