X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=config%2Fconfig.c;h=e282b257efa64760faef1a3c25e66351c0acafeb;hb=ff99b7b6299a8ebe433a31f7bf15b158e9dcdea8;hp=d72cd917904cb32b41cc048e1639f8ccff982078;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4;p=mmh diff --git a/config/config.c b/config/config.c index d72cd91..e282b25 100644 --- a/config/config.c +++ b/config/config.c @@ -7,14 +7,7 @@ */ #include - -#ifdef MHRC -# include -#endif - -#define nmhbindir(file) NMHBINDIR#file -#define nmhetcdir(file) NMHETCDIR#file -#define nmhlibdir(file) NMHLIBDIR#file +#include /* @@ -26,61 +19,53 @@ ** 3) Next, check in nmh Mail directory. ** 4) Next, check in nmh `etc' directory. */ - char * -etcpath (char *file) +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'; if (*pp == '\0') { pp = mypath; } else { - if ((pw = getpwnam (pp))) + if ((pw = getpwnam(pp))) pp = pw->pw_dir; else { if (cp) - *--cp = '/'; + *--cp = '/'; goto try_it; } } - snprintf (epath, sizeof(epath), "%s/%s", pp, cp ? cp : ""); + snprintf(epath, sizeof epath, "%s/%s", pp, cp ? cp : ""); if (cp) *--cp = '/'; - if (access (epath, R_OK) != NOTOK) + 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); - return (access (epath, R_OK) != NOTOK ? epath : file); + snprintf(epath, sizeof epath, NMHETCDIR"/%s", file); + return (access(epath, R_OK) != NOTOK ? epath : file); } @@ -99,7 +84,7 @@ struct swit anoyes[] = { */ /* 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"; @@ -108,32 +93,32 @@ char *mh_profile = ".mh_profile"; char *current = "cur"; /* standard component files */ -char *components = "components"; /* comp */ -char *replcomps = "replcomps"; /* repl */ +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 *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 *draftfolder = "drafts"; +char *draftfolder = "+drafts"; char *inbox = "Inbox"; -char *defaultfolder = "inbox"; +char *defaultfolder = "+inbox"; -char *pfolder = "Current-Folder"; +char *curfolder = "Current-Folder"; char *usequence = "Unseen-Sequence"; char *psequence = "Previous-Sequence"; char *nsequence = "Sequence-Negation"; /* profile entries for storage locations */ -char *nmhstorage = "nmh-storage"; -char *nmhcache = "nmh-cache"; +char *nmhstorage = "nmh-storage"; +char *nmhcache = "nmh-cache"; char *nmhprivcache = "nmh-private-cache"; /* profile entry for external ftp access command */ @@ -180,7 +165,7 @@ struct node *m_defs; /* profile/context structure */ /* ** This is the program to process MIME composition files */ -char *buildmimeproc = nmhbindir (/mhbuild); +char *buildmimeproc = NMHBINDIR"/mhbuild"; /* ** This is the program to `cat' a file. */ @@ -196,18 +181,18 @@ 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); +char *fileproc = NMHBINDIR"/refile"; /* ** This program is called to incorporate messages into a folder. */ -char *incproc = nmhbindir (/inc); +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); +char *installproc = NMHLIBDIR"/install-mh"; /* ** This is the default program invoked by a "list" response @@ -220,7 +205,7 @@ char *lproc = "more"; /* ** This is the path for the Bell equivalent mail program. */ -char *mailproc = nmhbindir (/mhmail); +char *mailproc = NMHBINDIR"/mhmail"; /* ** This is used by mhl as a front-end. It is also used @@ -237,29 +222,29 @@ char *moreproc = "more"; ** It is used by send/spost (with -filter) to filter the message ** for "Bcc:" recipients. */ -char *mhlproc = nmhlibdir (/mhl); +char *mhlproc = NMHLIBDIR"/mhl"; /* ** This program is called to pack a folder. */ -char *packproc = nmhbindir (/packf); +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); +char *postproc = NMHLIBDIR"/spost"; /* ** This is program is called by slocal to handle ** the action `folder' or `+'. */ -char *rcvstoreproc = nmhlibdir (/rcvstore); +char *rcvstoreproc = NMHLIBDIR"/rcvstore"; /* ** This program is called to remove a folder. */ -char *rmfproc = nmhbindir (/rmf); +char *rmfproc = NMHBINDIR"/rmf"; /* ** This program is called to remove a message by rmm or refile -nolink. @@ -271,13 +256,13 @@ 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); +char *sendproc = NMHBINDIR"/send"; /* ** This is the path to the program used by "show" ** to display non-text (MIME) messages. */ -char *showmimeproc = nmhbindir (/mhshow); +char *showmimeproc = NMHBINDIR"/mhshow"; /* ** This is the default program called by "show" to filter @@ -285,12 +270,12 @@ 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 = NMHLIBDIR"/mhl"; /* ** This program is called after comp, et. al., have built a draft */ -char *whatnowproc = nmhbindir (/whatnow); +char *whatnowproc = NMHBINDIR"/whatnow"; /* ** This is the sendmail interface to use for sending mail. @@ -320,7 +305,7 @@ 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); +char *AliasFile = NMHETCDIR"/MailAliases"; /* ** File protections