Factor trim format function out

[mmh] / config / config.c

diff --git a/config/config.c b/config/config.c
index bfdc242..5e25041 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -62,6 +62,7 @@ char *digestcomps    = "digestcomps";      /* forw -digest */
 /* standard format (filter) files */
 char *mhlformat      = "mhl.format";       /* show         */
 char *mhlreply       = "mhl.reply";        /* repl         */
+char *scanformat     = "scan.default";     /* scan/inc     */
 
 
 /*
@@ -71,6 +72,7 @@ char *mhlreply       = "mhl.reply";        /* repl         */
 /* some default folder names */
 char *defaultfolder = "+inbox";
 char *draftfolder = "+drafts";
+char *trashfolder = "+trash";
 
 char *inbox = "Inbox";  /* profile entry name to specify the default folder */
 char *curfolder = "Current-Folder";
@@ -92,14 +94,11 @@ char *nsequence = "Sequence-Negation";
 
 /* profile entries for storage locations */
 char *nmhstorage   = "nmh-storage";
-char *nmhcache     = "nmh-cache";
-char *nmhprivcache = "nmh-private-cache";
 
-/* profile entry for external ftp access command */
-char *nmhaccessftp = "nmh-access-ftp";
-
-/* Default attachment header field name */
+/* Default header field names */
 char *attach_hdr = "Attach";
+char *sign_hdr = "Sign";
+char *enc_hdr = "Enc";
 
 /* the tool to query the mime type of a file */
 char *mimetypequery = "Mime-Type-Query";
@@ -112,23 +111,15 @@ char *mimetypequeryproc = "file -b --mime";
 */
 
 /*
-** 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";
-
-/*
 ** 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.
+** the message to show.
 */
-char *listproc = "show -file";
+char *listproc = "show";
 
 /*
 ** This is used by mhl as a front-end.  It is also used
-** by mhshow as the default method of displaying message bodies
+** by show(1) as the default method of displaying message bodies
 ** or message parts of type text/plain.
 */
 char *defaultpager = "more";
@@ -141,21 +132,9 @@ char *defaultpager = "more";
 char *defaulteditor = "vi";
 
 /*
-** 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 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.
@@ -173,28 +152,15 @@ char *mailspool = MAILSPOOL;
 */
 
 /*
-** The prefix that is prepended to the name of message files when they
-** are "removed" by rmm. This should typically be `,' or `#'.
-*/
-char *backup_prefix = ",";
-
-/*
-** Name of link to file to which you are replying or which you are
-** redistributing. See `$mhaltmsg' in the mh-profile(5) man page.
-*/
-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";