X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=config%2Fconfig.c;h=e51397ad5a6255a514e02152e4cd8b6f0f548695;hp=9add9e29e9c65f9c99a4effb33fb27d2aecb607d;hb=068380df11432a5341882e658ec9cf5c0b54721d;hpb=6c75e2f0f00732488aa03b967713d95037edd895

diff --git a/config/config.c b/config/config.c
index 9add9e2..e51397a 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    */
@@ -27,7 +26,7 @@ struct node *m_defs;    /* profile/context structure  */
 
 
 /*
-** nmh constants
+** nmh constants: standard file names
 **
 ** Important: Adjust uip/mmh.sh if you make changes here!
 */
@@ -51,10 +50,6 @@ char *context = "context";
 */
 char *mh_seq = ".mh_sequences";
 
-/* name of current message "sequence" */
-char *current = "cur";
-
-
 /* standard component files */
 char *components     = "components";       /* comp         */
 char *replcomps      = "replcomps";        /* repl         */
@@ -66,15 +61,31 @@ 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 *inbox = "Inbox";
-char *defaultfolder = "+inbox";
 
+/*
+** standard names for: mail folders, sequences, and profile entries
+*/
+
+/* some default folder names */
+char *defaultfolder = "+inbox";
 char *draftfolder = "+drafts";
 
+char *inbox = "Inbox";  /* profile entry name to specify the default folder */
 char *curfolder = "Current-Folder";
+
+/* predefined sequences */
+char *seq_all    = "a";
+char *seq_beyond = "b";  /* the previous `new' sequence */
+char *seq_cur    = "c";
+char *seq_first  = "f";
+char *seq_last   = "l";
+char *seq_next   = "n";
+char *seq_prev   = "p";
+char *seq_unseen = "u";
+char *seq_neg    = "!";
+
 char *usequence = "Unseen-Sequence";
 char *psequence = "Previous-Sequence";
 char *nsequence = "Sequence-Negation";
@@ -87,25 +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";
 
-/*
-** nmh processes
-*/
+/* the tool to query the mime type of a file */
+char *mimetypequery = "Mime-Type-Query";
+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";
 
 /*
-** mhl runs this program as a visual-end.
+** nmh default programs
 */
-char *faceproc = NULL;
 
 /*
 ** This program is usually called directly by users, but it is
@@ -120,18 +124,12 @@ char *fileproc = NMHBINDIR"/refile";
 char *incproc = NMHBINDIR"/inc";
 
 /*
-** When a user runs an nmh program for the first time, this program
-** is called to create his nmh profile, and mail directory.
+** 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 *installproc = NMHLIBDIR"/install-mh";
-
-/*
-** 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";
+char *lproc = NMHBINDIR"/show -file";
 
 /*
 ** This is the path for the Bell equivalent mail program.
@@ -143,39 +141,32 @@ char *mailproc = NMHBINDIR"/mhmail";
 ** 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 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 to pack a folder.
+** This is the editor invoked by the various message
+** composition programs.  It SHOULD be a full screen
+** editor, such as vi or emacs, but any editor will work.
 */
-char *packproc = NMHBINDIR"/packf";
+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";
+char *postproc = NMHBINDIR"/spost";
 
 /*
 ** This is program is called by slocal to handle
 ** the action `folder' or `+'.
 */
-char *rcvstoreproc = NMHLIBDIR"/rcvstore";
+char *rcvstoreproc = NMHBINDIR"/rcvstore";
 
 /*
-** This program is called to remove a folder.
+** This is program is called by slocal to handle
+** the action `file', `mbox' or `>'.
 */
-char *rmfproc = NMHBINDIR"/rmf";
+char *rcvpackproc = NMHBINDIR"/rcvpack";
 
 /*
 ** This program is called to remove a message by rmm or refile -nolink.
@@ -201,7 +192,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 (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
@@ -214,17 +215,20 @@ char *whatnowproc = NMHBINDIR"/whatnow";
 char *sendmail = SENDMAILPATH;
 
 /*
-** The prefix that is prepended to the name of message files when they
-** are "removed" by rmm. This should typically be `,' or `#'.
+** This is the path to the system mail spool directory (e.g. `/var/mail').
 */
-char *backup_prefix = ",";
+char *mailspool = MAILSPOOL;
+
 
 /*
-** This is the editor invoked by the various message
-** composition programs.  It SHOULD be a full screen
-** editor, such as vi or emacs, but any editor will work.
+** file stuff
 */
-char *defaulteditor = "vi";
+
+/*
+** 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