X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=config%2Fconfig.c;h=245ecdeafa0daf08aa497e8b1ca192ad083589e9;hp=97a24ffd56e904eba64dd83061a64d264ae04f4c;hb=aa2bd5081731e83a2cedba6f7f2be61cde201e7d;hpb=18017df38ebb626f6eed6f339641fd1298c326e7 diff --git a/config/config.c b/config/config.c index 97a24ff..245ecde 100644 --- a/config/config.c +++ b/config/config.c @@ -1,53 +1,35 @@ /* - * config.c -- master nmh configuration file - * - * This code is Copyright (c) 2002, by the authors of nmh. See the - * COPYRIGHT file in the root directory of the nmh distribution for - * complete copyright information. - */ +** config.c -- master nmh configuration file +** +** This code is Copyright (c) 2002, by the authors of nmh. See the +** COPYRIGHT file in the root directory of the nmh distribution for +** complete copyright information. +*/ #include - -#ifdef MHRC -# include -#endif - -#define nmhbindir(file) NMHBINDIR#file -#define nmhetcdir(file) NMHETCDIR#file -#define nmhlibdir(file) NMHLIBDIR#file +#include /* - * Find the location of a format or configuration - * file, and return its absolute pathname. - * - * 1) If already absolute pathname, then leave unchanged. - * 2) Next, if it begins with ~user, then expand it. - * 3) Next, check in nmh Mail directory. - * 4) Next, check in nmh `etc' directory. - */ +** Find the location of a format or configuration +** file, and return its absolute pathname. +** +** 1) If already absolute pathname, then leave unchanged. +** 2) Next, if it begins with ~user, then expand it. +** 3) Next, check in nmh Mail directory. +** 4) Next, check in nmh `etc' directory. +*/ char * etcpath (char *file) { static char epath[PATH_MAX]; char *cp; -#ifdef MHRC char *pp; struct passwd *pw; -#endif -#ifdef MHRC context_read(); -#endif - - switch (*file) { - case '/': - /* If already absolute pathname, return it */ - return file; - -#ifdef MHRC - case '~': + if (*file == '~') { /* Expand ~username */ if ((cp = strchr(pp = file + 1, '/'))) *cp++ = '\0'; @@ -69,24 +51,28 @@ etcpath (char *file) if (access (epath, R_OK) != NOTOK) return epath; /* else fall */ -try_it: -#endif /* MHRC */ + } - default: - /* Check nmh Mail directory */ - if (access ((cp = m_mailpath (file)), R_OK) != NOTOK) - return cp; +try_it: + if (*file == '/') { + /* If already absolute pathname, return it */ + return file; } + /* Check nmh Mail directory */ + strncpy(epath, toabsdir(file), sizeof epath); + if (access (epath, R_OK) != NOTOK) + return epath; + /* Check nmh `etc' directory */ - snprintf (epath, sizeof(epath), nmhetcdir(/%s), file); + snprintf (epath, sizeof(epath), NMHETCDIR"/%s", file); return (access (epath, R_OK) != NOTOK ? epath : file); } /* - * Standard yes/no switches structure - */ +** Standard yes/no switches structure +*/ struct swit anoyes[] = { { "no", 0 }, @@ -95,11 +81,11 @@ struct swit anoyes[] = { }; /* - * nmh constants - */ +** nmh constants +*/ /* initial profile for new users */ -char *mh_defaults = nmhetcdir (/mh.profile); +char *mh_defaults = NMHETCDIR"/mh.profile"; /* default name of user profile */ char *mh_profile = ".mh_profile"; @@ -121,10 +107,10 @@ char *mhlformat = "mhl.format"; /* show */ char *mhlreply = "mhl.reply"; /* repl -filter */ char *mhlforward = "mhl.forward"; /* forw -filter */ -char *draft = "draft"; +char *draftfolder = "+drafts"; char *inbox = "Inbox"; -char *defaultfolder = "inbox"; +char *defaultfolder = "+inbox"; char *pfolder = "Current-Folder"; char *usequence = "Unseen-Sequence"; @@ -143,19 +129,19 @@ char *mhlibdir = NMHLIBDIR; char *mhetcdir = NMHETCDIR; /* - * nmh not-so constants - */ +** nmh not-so constants +*/ /* - * Default name for the nmh context file. - */ +** Default name for the nmh context file. +*/ char *context = "context"; /* - * Default name of file for public sequences. If NULL, - * then nmh will use private sequences by default, unless the - * user defines a value using the "mh-sequences" profile entry. - */ +** Default name of file for public sequences. If NULL, +** then nmh will use private sequences by default, unless the +** user defines a value using the "mh-sequences" profile entry. +*/ #ifdef NOPUBLICSEQ char *mh_seq = NULL; #else @@ -163,8 +149,8 @@ char *mh_seq = ".mh_sequences"; #endif /* - * nmh globals - */ +** nmh globals +*/ char ctxflags; /* status of user's context */ char *invo_name; /* command invocation name */ @@ -174,166 +160,166 @@ char *ctxpath; /* pathname of user's context */ struct node *m_defs; /* profile/context structure */ /* - * nmh processes - */ +** nmh processes +*/ /* - * This is the program to process MIME composition files - */ -char *buildmimeproc = nmhbindir (/mhbuild); +** This is the program to process MIME composition files +*/ +char *buildmimeproc = NMHBINDIR"/mhbuild"; /* - * This is the program to `cat' a file. - */ +** This is the program to `cat' a file. +*/ char *catproc = "/bin/cat"; /* - * mhl runs this program as a visual-end. - */ +** mhl runs this program as a visual-end. +*/ char *faceproc = NULL; /* - * 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 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 program is called to incorporate messages into a folder. +*/ +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. - */ -char *installproc = nmhlibdir (/install-mh); +** When a user runs an nmh program for the first time, this program +** is called to create his nmh profile, and mail directory. +*/ +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. - */ +** 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); +** This is the path for the Bell equivalent mail program. +*/ +char *mailproc = NMHBINDIR"/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. - */ +** 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"; /* - * 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 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. - */ -char *packproc = nmhbindir (/packf); +** This program is called to pack a folder. +*/ +char *packproc = NMHBINDIR"/packf"; /* - * 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 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 is program is called by slocal to handle +** the action `folder' or `+'. +*/ +char *rcvstoreproc = NMHLIBDIR"/rcvstore"; /* - * This program is called to remove a folder. - */ -char *rmfproc = nmhbindir (/rmf); +** This program is called to remove a folder. +*/ +char *rmfproc = NMHBINDIR"/rmf"; /* - * 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. - */ +** 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. +** 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); +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 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 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 program is called after comp, et. al., have built a draft - */ -char *whatnowproc = nmhbindir (/whatnow); +** This program is called after comp, et. al., have built a draft +*/ +char *whatnowproc = NMHBINDIR"/whatnow"; /* - * This is the sendmail interface to use for sending mail. - */ +** This is the sendmail interface to use for sending mail. +*/ 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 `#'. - */ +** 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 = ","; /* - * 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. - */ +** 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 *defaulteditor = "vi"; /* - * Name of link to file to which you are replying or which you are - * redistributing. See `$mhaltmsg' in the mh-profile(5) man page. - */ +** 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 = "@"; /* - * This is the global nmh alias file. It is somewhat obsolete, since - * global aliases should be handled by the Mail Transport Agent (MTA). - */ -char *AliasFile = nmhetcdir (/MailAliases); +** This is the global nmh alias file. It is somewhat obsolete, since +** global aliases should be handled by the Mail Transport Agent (MTA). +*/ +char *AliasFile = NMHETCDIR"/MailAliases"; /* - * File protections - */ +** File protections +*/ /* - * Folders (directories) are created with this protection (mode) - */ +** Folders (directories) are created with this protection (mode) +*/ char *foldprot = "700"; /* - * 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. - */ +** 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. +*/ char *msgprot = "600";