X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=config%2Fconfig.c;h=5e250414946e3686b97a1a1253c1558109566c0a;hp=2ccf37901c53ce40910ca52ebc0b6845ab67e7ec;hb=18591f8e001ecedbee48a51c1d1f08ebaa1c15c8;hpb=fb0594cb913cab5e14e2c295b79eb48cc675bbbf diff --git a/config/config.c b/config/config.c index 2ccf379..5e25041 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,8 @@ 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 */ +char *scanformat = "scan.default"; /* scan/inc */ /* @@ -73,6 +72,7 @@ char *mhlforward = "mhl.forward"; /* forw -filter */ /* 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"; @@ -94,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"; @@ -114,46 +111,18 @@ char *mimetypequeryproc = "file -b --mime"; */ /* -** 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"; - -/* -** This program is called to incorporate messages into a folder. -*/ -char *incproc = NMHBINDIR"/inc"; - -/* ** 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 = "show -file"; - -/* -** This is the path for the Bell equivalent mail program. +** the message to show. */ -char *mailproc = NMHBINDIR"/mhmail"; +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 *moreproc = "more"; +char *defaultpager = "more"; /* ** This is the editor invoked by the various message @@ -163,57 +132,9 @@ 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 = 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 (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 = NMHBINDIR"/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. @@ -231,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";