X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=config%2Fconfig.c;h=fa0b0fc44a291d62e99ad14f6cdc9209cc75b7c2;hp=6a1e0b1d3b0e514b03dfbbce1ba677e887507840;hb=612e67b21d1c9a6cc5db0e2903ddaeb5f2fbe2a0;hpb=83bc095e820728da7dfe22d2f95962660c79de03

diff --git a/config/config.c b/config/config.c
index 6a1e0b1..fa0b0fc 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         */
 
 
 /*
@@ -77,9 +75,7 @@ char *draftfolder = "+drafts";
 char *inbox = "Inbox";  /* profile entry name to specify the default folder */
 char *curfolder = "Current-Folder";
 
-/* name of current message "sequence" */
-char *current = "cur";
-
+/* predefined sequences */
 char *seq_all    = "a";
 char *seq_beyond = "b";  /* the previous `new' sequence */
 char *seq_cur    = "c";
@@ -102,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
@@ -126,29 +119,24 @@ 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";
+char *listproc = "show -file";
 
 /*
 ** This is the path for the Bell equivalent mail program.
 */
-char *mailproc = NMHBINDIR"/mhmail";
+char *mailproc = "mhmail";
 
 /*
 ** 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
@@ -161,13 +149,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.
@@ -193,17 +175,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
@@ -215,6 +197,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