#include <h/mh.h>
-#ifdef MHRC
-# include <pwd.h>
-#endif
-
-#define nmhbindir(file) NMHBINDIR#file
-#define nmhetcdir(file) NMHETCDIR#file
-#define nmhlibdir(file) NMHLIBDIR#file
-
-
-/*
-** 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 '~':
- /* 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 = '/';
-
- 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;
- }
-
- /* 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 }
};
+
/*
** 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";
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 */
char *mhlibdir = NMHLIBDIR;
char *mhetcdir = NMHETCDIR;
+
/*
** nmh not-so constants
*/
char *mh_seq = ".mh_sequences";
#endif
+
/*
** nmh globals
*/
char *ctxpath; /* pathname of user's context */
struct node *m_defs; /* profile/context structure */
+
/*
** nmh processes
*/
/*
** 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.
*/
** 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
/*
** 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
** 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.
** 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
** 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.
** 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
-*/
+char *AliasFile = NMHETCDIR"/MailAliases";
/*
** Folders (directories) are created with this protection (mode)
projects / mmh / blobdiff