Removed the `mhbuild' indirection via `buildmimeproc'.

[mmh] / config / config.c

diff --git a/config/config.c b/config/config.c
index 30c9574..e51397a 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -14,7 +14,6 @@
 ** nmh globals
 */
 
-char *mhlibdir = NMHLIBDIR;
 char *mhetcdir = NMHETCDIR;
 
 char *invo_name;        /* command invocation name    */
@@ -62,8 +61,7 @@ char *digestcomps    = "digestcomps";      /* forw -digest */
 
 /* standard format (filter) files */
 char *mhlformat      = "mhl.format";       /* show         */
-char *mhlreply       = "mhl.reply";        /* repl -filter */
-char *mhlforward     = "mhl.forward";      /* forw -filter */
+char *mhlreply       = "mhl.reply";        /* repl         */
 
 
 /*
@@ -103,6 +101,9 @@ char *nmhaccessftp = "nmh-access-ftp";
 /* Default attachment header field name */
 char *attach_hdr = "Attach";
 
+/* the tool to query the mime type of a file */
+char *mimetypequery = "Mime-Type-Query";
+char *mimetypequeryproc = "file -b --mime";
 
 
 
@@ -111,16 +112,6 @@ char *attach_hdr = "Attach";
 */
 
 /*
-** This is the program to process MIME composition files
-*/
-char *buildmimeproc = NMHBINDIR"/mhbuild";
-
-/*
-** This is the program to `cat' a file.
-*/
-char *catproc = "/bin/cat";
-
-/*
 ** This program is usually called directly by users, but it is
 ** also invoked by the spost program to process an "Fcc", or by
 ** comp/repl/forw/dist to refile a draft message.
@@ -133,12 +124,12 @@ char *fileproc = NMHBINDIR"/refile";
 char *incproc = NMHBINDIR"/inc";
 
 /*
-** This is the default program invoked by a "list" response
-** at the "What now?" prompt.  It is also used by the draft
-** folder facility in comp/dist/forw/repl to display the
-** draft message.
+** This is the default program invoked by a "list" or "display" response
+** at the "What now?" prompt. It will be given the absolute pathname of
+** the message to show. The string ``show -file'' is most likely what you
+** want to be you lproc.
 */
-char *lproc = "more";
+char *lproc = NMHBINDIR"/show -file";
 
 /*
 ** This is the path for the Bell equivalent mail program.
@@ -150,7 +141,7 @@ char *mailproc = NMHBINDIR"/mhmail";
 ** by mhshow as the default method of displaying message bodies
 ** or message parts of type text/plain.
 */
-char *moreproc = "more";
+char *defaultpager = "more";
 
 /*
 ** This is the editor invoked by the various message
@@ -163,13 +154,19 @@ char *defaulteditor = "vi";
 ** This is the delivery program called by send to actually
 ** deliver mail to users.  This is the interface to the MTS.
 */
-char *postproc = NMHLIBDIR"/spost";
+char *postproc = NMHBINDIR"/spost";
 
 /*
 ** This is program is called by slocal to handle
 ** the action `folder' or `+'.
 */
-char *rcvstoreproc = NMHLIBDIR"/rcvstore";
+char *rcvstoreproc = NMHBINDIR"/rcvstore";
+
+/*
+** This is program is called by slocal to handle
+** the action `file', `mbox' or `>'.
+*/
+char *rcvpackproc = NMHBINDIR"/rcvpack";
 
 /*
 ** This program is called to remove a message by rmm or refile -nolink.
@@ -195,17 +192,17 @@ char *showmimeproc = NMHBINDIR"/mhshow";
 ** changed to a pager (such as "more" or "less") if you prefer
 ** that such message not be filtered in any way.
 */
-char *showproc = NMHLIBDIR"/mhl";
+char *showproc = NMHBINDIR"/mhl";
 
 /*
 ** This is the program (mhl) used to filter messages.  It is
 ** used by mhshow to filter and display the message headers of
-** MIME messages.  It is used by repl/forw (with -filter)
-** to filter the message to which you are replying/forwarding.
+** MIME messages.  It is used by repl (with -filter)
+** to filter the message to which you are replying.
 ** It is used by send/spost (with -filter) to filter the message
 ** for "Bcc:" recipients.
 */
-char *mhlproc = NMHLIBDIR"/mhl";
+char *mhlproc = NMHBINDIR"/mhl";
 
 /*
 ** This program is called after comp, et. al., have built a draft
@@ -217,6 +214,11 @@ char *whatnowproc = NMHBINDIR"/whatnow";
 */
 char *sendmail = SENDMAILPATH;
 
+/*
+** This is the path to the system mail spool directory (e.g. `/var/mail').
+*/
+char *mailspool = MAILSPOOL;
+
 
 /*
 ** file stuff