Moved etcpath() from config/config.c to sbr/path.c

[mmh] / config / config.c

diff --git a/config/config.c b/config/config.c
index 24827e9..83ea0ae 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -8,88 +8,17 @@
 
 #include <h/mh.h>
 
-#ifdef MHRC
-# include <pwd.h>
-#endif
-
-
-/*
-** 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
 */
@@ -104,32 +33,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 */
@@ -138,6 +67,7 @@ char *nmhaccessftp = "nmh-access-ftp";
 char *mhlibdir = NMHLIBDIR;
 char *mhetcdir = NMHETCDIR;
 
+
 /*
 ** nmh not-so constants
 */
@@ -158,6 +88,7 @@ char *mh_seq = NULL;
 char *mh_seq = ".mh_sequences";
 #endif
 
+
 /*
 ** nmh globals
 */
@@ -169,6 +100,7 @@ char *defpath;          /* pathname of user's profile */
 char *ctxpath;          /* pathname of user's context */
 struct node *m_defs;    /* profile/context structure  */
 
+
 /*
 ** nmh processes
 */
@@ -177,6 +109,7 @@ struct node *m_defs;    /* profile/context structure  */
 ** This is the program to process MIME composition files
 */
 char *buildmimeproc = NMHBINDIR"/mhbuild";
+
 /*
 ** This is the program to `cat' a file.
 */
@@ -319,10 +252,6 @@ char *altmsglink = "@";
 char *AliasFile = NMHETCDIR"/MailAliases";
 
 /*
-** File protections
-*/
-
-/*
 ** Folders (directories) are created with this protection (mode)
 */
 char *foldprot = "700";