X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=config%2Fconfig.c;h=bd83bcb36da4eae0bf5910972482673a4632f125;hp=294352aeec5ef1fcab08c462bf4596ff5f5244fb;hb=5b92ee6942b9b466914f5faa5fa4c00a2ebc6d35;hpb=3cc8ed080f6e741b8df04a3ebe764c659e75cb38

diff --git a/config/config.c b/config/config.c
index 294352a..bd83bcb 100644
--- 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         */
 
 
 /*
@@ -100,21 +98,18 @@ char *nmhprivcache = "nmh-private-cache";
 /* profile entry for external ftp access command */
 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";
 
-/*
-** nmh default programs
-*/
 
-/*
-** This is the program to process MIME composition files
-*/
-char *buildmimeproc = NMHBINDIR"/mhbuild";
 
 /*
-** This is the program to `cat' a file.
+** nmh default programs
 */
-char *catproc = "/bin/cat";
 
 /*
 ** This program is usually called directly by users, but it is
@@ -124,29 +119,19 @@ char *catproc = "/bin/cat";
 char *fileproc = NMHBINDIR"/refile";
 
 /*
-** This program is called to incorporate messages into a folder.
-*/
-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 listproc.
 */
-char *lproc = "more";
-
-/*
-** This is the path for the Bell equivalent mail program.
-*/
-char *mailproc = NMHBINDIR"/mhmail";
+char *listproc = "show -file";
 
 /*
 ** This is used by mhl as a front-end.  It is also used
 ** 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
@@ -159,13 +144,7 @@ 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";
-
-/*
-** This is program is called by slocal to handle
-** the action `folder' or `+'.
-*/
-char *rcvstoreproc = NMHLIBDIR"/rcvstore";
+char *postproc = NMHBINDIR"/spost";
 
 /*
 ** This program is called to remove a message by rmm or refile -nolink.
@@ -180,30 +159,6 @@ char *rmmproc = NULL;
 char *sendproc = NMHBINDIR"/send";
 
 /*
-** This is the path to the program used by "show"
-** to display non-text (MIME) messages.
-*/
-char *showmimeproc = NMHBINDIR"/mhshow";
-
-/*
-** This is the default program called by "show" to filter
-** and display standard text (non-MIME) messages.  It can be
-** 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";
-
-/*
-** 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.
-** It is used by send/spost (with -filter) to filter the message
-** for "Bcc:" recipients.
-*/
-char *mhlproc = NMHLIBDIR"/mhl";
-
-/*
 ** This program is called after comp, et. al., have built a draft
 */
 char *whatnowproc = NMHBINDIR"/whatnow";
@@ -213,6 +168,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