projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Code cosmetic
[mmh]
/
config
/
config.c
diff --git
a/config/config.c
b/config/config.c
index
24827e9
..
e282b25
100644
(file)
--- a/
config/config.c
+++ b/
config/config.c
@@
-7,10
+7,7
@@
*/
#include <h/mh.h>
*/
#include <h/mh.h>
-
-#ifdef MHRC
-# include <pwd.h>
-#endif
+#include <pwd.h>
/*
/*
@@
-22,61
+19,53
@@
** 3) Next, check in nmh Mail directory.
** 4) Next, check in nmh `etc' directory.
*/
** 3) Next, check in nmh Mail directory.
** 4) Next, check in nmh `etc' directory.
*/
-
char *
char *
-etcpath (char *file)
+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;
-
-#ifdef MHRC
- case '~':
+ if (*file == '~') {
/* Expand ~username */
if ((cp = strchr(pp = file + 1, '/')))
*cp++ = '\0';
if (*pp == '\0') {
pp = mypath;
} else {
/* 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)
pp = pw->pw_dir;
else {
if (cp)
- *--cp = '/';
+ *--cp = '/';
goto try_it;
}
}
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 (cp)
*--cp = '/';
- if (access (epath, R_OK) != NOTOK)
+ if (access(epath, R_OK) != NOTOK)
return epath; /* else fall */
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 */
/* 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);
}
}
@@
-104,32
+93,32
@@
char *mh_profile = ".mh_profile";
char *current = "cur";
/* standard component files */
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 *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 */
/* 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 *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 *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 *nmhprivcache = "nmh-private-cache";
/* profile entry for external ftp access command */