Removed hard-coded -I.. and -I../.. from INCLUDES.

[mmh] / config / config.c

diff --git a/config/config.c b/config/config.c
index cdf8f5a..82c66c3 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,46 +112,26 @@ 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.
 */
-char *fileproc = NMHBINDIR"/refile";
+char *fileproc = "refile";
 
 /*
-** This program is called to incorporate messages into a folder.
+** 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 *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.
-*/
-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
@@ -160,57 +141,15 @@ char *moreproc = "more";
 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";
-
-/*
 ** This program is called to remove a message by rmm or refile -nolink.
 ** It's usually empty, which means to rename the file to a backup name.
 */
 char *rmmproc = NULL;
 
 /*
-** This program is usually called by the user's whatnowproc, but it
-** may also be called directly to send a message previously composed.
- */
-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";
+char *whatnowproc = "whatnow";
 
 /*
 ** This is the sendmail interface to use for sending mail.
@@ -242,14 +181,13 @@ char *altmsglink = "@";
 /*
 ** Folders (directories) are created with this protection (mode)
 */
-char *foldprot = "700";
+char *foldprot = "0700";
 
 /*
 ** Every NEW message will be created with this protection.  When a
-** message is filed it retains its protection, so this only applies
-** to messages coming in through inc.
+** message is filed it retains its protection.
 */
-char *msgprot = "600";
+char *msgprot = "0600";