X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=config%2Fconfig.c;h=f5471a9cbdf24d588fe58bc5d5d36cd3f9090889;hp=f03cd196dba8edaaeaa5f9df431672e733075d1e;hb=a485ed478abbd599d8c9aab48934e7a26733ecb1;hpb=f480c03187724e54e5391ee61b810827da319a6c diff --git a/config/config.c b/config/config.c index f03cd19..f5471a9 100644 --- a/config/config.c +++ b/config/config.c @@ -1,4 +1,3 @@ - /* * config.c -- master nmh configuration file * @@ -26,77 +25,76 @@ * 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; + static char epath[PATH_MAX]; + char *cp; #ifdef MHRC - char *pp; - struct passwd *pw; + char *pp; + struct passwd *pw; #endif #ifdef MHRC - context_read(); + context_read(); #endif - switch (*file) { - case '/': - /* If already absolute pathname, return it */ - return file; + switch (*file) { + case '/': + /* If already absolute pathname, return it */ + return file; #ifdef MHRC - case '~': - /* Expand ~username */ - if ((cp = strchr(pp = file + 1, '/'))) - *cp++ = '\0'; - if (*pp == '\0') { - pp = mypath; - } else { - if ((pw = getpwnam (pp))) - pp = pw->pw_dir; - else { - if (cp) - *--cp = '/'; - goto try_it; + case '~': + /* Expand ~username */ + if ((cp = strchr(pp = file + 1, '/'))) + *cp++ = '\0'; + if (*pp == '\0') { + pp = mypath; + } else { + if ((pw = getpwnam (pp))) + pp = pw->pw_dir; + else { + if (cp) + *--cp = '/'; + goto try_it; + } } - } - snprintf (epath, sizeof(epath), "%s/%s", pp, cp ? cp : ""); - if (cp) - *--cp = '/'; + snprintf (epath, sizeof(epath), "%s/%s", pp, cp ? cp : ""); + if (cp) + *--cp = '/'; - if (access (epath, R_OK) != NOTOK) - return epath; /* else fall */ + 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; - } + default: + /* Check nmh Mail directory */ + if (access ((cp = m_mailpath (file)), R_OK) != NOTOK) + return cp; + } - /* Check nmh `etc' directory */ - snprintf (epath, sizeof(epath), nmhetcdir(/%s), file); - return (access (epath, R_OK) != NOTOK ? epath : file); + /* Check nmh `etc' directory */ + snprintf (epath, sizeof(epath), nmhetcdir(/%s), file); + return (access (epath, R_OK) != NOTOK ? epath : file); } -/* +/* * Standard yes/no switches structure */ struct swit anoyes[] = { - { "no", 0 }, - { "yes", 0 }, - { NULL, 0 } + { "no", 0 }, + { "yes", 0 }, + { NULL, 0 } }; -/* +/* * nmh constants */ @@ -110,18 +108,18 @@ char *mh_profile = ".mh_profile"; char *current = "cur"; /* standard component files */ -char *components = "components"; /* comp */ -char *replcomps = "replcomps"; /* repl */ -char *replgroupcomps = "replgroupcomps"; /* repl -group */ -char *forwcomps = "forwcomps"; /* forw */ -char *distcomps = "distcomps"; /* dist */ -char *rcvdistcomps = "rcvdistcomps"; /* rcvdist */ -char *digestcomps = "digestcomps"; /* forw -digest */ +char *components = "components"; /* comp */ +char *replcomps = "replcomps"; /* repl */ +char *replgroupcomps = "replgroupcomps"; /* repl -group */ +char *forwcomps = "forwcomps"; /* forw */ +char *distcomps = "distcomps"; /* dist */ +char *rcvdistcomps = "rcvdistcomps"; /* rcvdist */ +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 *mhlformat = "mhl.format"; /* show */ +char *mhlreply = "mhl.reply"; /* repl -filter */ +char *mhlforward = "mhl.forward"; /* forw -filter */ char *draft = "draft"; @@ -144,7 +142,7 @@ char *nmhaccessftp = "nmh-access-ftp"; char *mhlibdir = NMHLIBDIR; char *mhetcdir = NMHETCDIR; -/* +/* * nmh not-so constants */ @@ -164,18 +162,18 @@ char *mh_seq = NULL; char *mh_seq = ".mh_sequences"; #endif -/* +/* * nmh globals */ -char ctxflags; /* status of user's context */ -char *invo_name; /* command invocation name */ -char *mypath; /* user's $HOME */ -char *defpath; /* pathname of user's profile */ -char *ctxpath; /* pathname of user's context */ -struct node *m_defs; /* profile/context structure */ +char ctxflags; /* status of user's context */ +char *invo_name; /* command invocation name */ +char *mypath; /* user's $HOME */ +char *defpath; /* pathname of user's profile */ +char *ctxpath; /* pathname of user's context */ +struct node *m_defs; /* profile/context structure */ -/* +/* * nmh processes */ @@ -191,7 +189,6 @@ char *catproc = "/bin/cat"; /* * mhl runs this program as a visual-end. */ - char *faceproc = NULL; /* @@ -199,20 +196,17 @@ char *faceproc = NULL; * 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); /* * 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); /* @@ -221,13 +215,11 @@ char *installproc = nmhlibdir (/install-mh); * 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); /* @@ -235,10 +227,9 @@ char *mailproc = nmhbindir (/mhmail); * 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) @@ -246,54 +237,46 @@ char *moreproc = "more"; * 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 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 program is called by slocal to handle * the action `folder' or `+'. */ - char *rcvstoreproc = nmhlibdir (/rcvstore); -/* - * This program is called to remove a folder. +/* + * 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. */ - 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); /* @@ -302,32 +285,27 @@ 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); -/* +/* * This program is called after comp, et. al., have built a draft */ - char *whatnowproc = nmhbindir (/whatnow); -/* +/* * This program is called to list/validate the addresses in a message. */ - char *whomproc = nmhbindir (/whom); -/* +/* * 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 `#'. */ - char *backup_prefix = ","; /* @@ -335,7 +313,6 @@ char *backup_prefix = ","; * composition programs. It SHOULD be a full screen * editor, such as vi or emacs, but any editor will work. */ - char *defaulteditor = "vi"; /* @@ -344,21 +321,19 @@ char *defaulteditor = "vi"; */ 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); -/* +/* * File protections */ /* * Folders (directories) are created with this protection (mode) */ - char *foldprot = "700"; /* @@ -366,6 +341,4 @@ char *foldprot = "700"; * message is filed it retains its protection, so this only applies * to messages coming in through inc. */ - char *msgprot = "600"; -