s/pfolder/curfolder/g

[mmh] / config / config.c

diff --git a/config/config.c b/config/config.c
index cc12128..7454666 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -7,10 +7,7 @@
 */
 
 #include <h/mh.h>
-
-#ifdef MHRC
-# include <pwd.h>
-#endif
+#include <pwd.h>
 
 
 /*
@@ -28,7 +25,6 @@ etcpath (char *file)
 {
        static char epath[PATH_MAX];
        char *cp;
-#ifdef MHRC
        char *pp;
        struct passwd *pw;
 
@@ -56,9 +52,8 @@ etcpath (char *file)
                if (access (epath, R_OK) != NOTOK)
                        return epath;  /* else fall */
        }
-try_it:
-#endif /* MHRC */
 
+try_it:
        if (*file == '/') {
                /* If already absolute pathname, return it */
                return file;
@@ -117,7 +112,7 @@ char *draftfolder = "+drafts";
 char *inbox = "Inbox";
 char *defaultfolder = "+inbox";
 
-char *pfolder = "Current-Folder";
+char *curfolder = "Current-Folder";
 char *usequence = "Unseen-Sequence";
 char *psequence = "Previous-Sequence";
 char *nsequence = "Sequence-Negation";