X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=config%2Fconfig.c;h=63c272cf5479a05864cb6675bd4a593ba584d22b;hb=b3bc649e0562c9aa68acdf7fb5c8c03335cafb25;hp=c2d307eb72e0f31a2798ee2d132120d3e58b5205;hpb=5dd6771b28c257af405d7248639ed0e3bcdce38b;p=mmh

diff --git a/config/config.c b/config/config.c
index c2d307e..63c272c 100644
--- a/config/config.c
+++ b/config/config.c
@@ -8,10 +8,8 @@
  */
 
 #include <h/mh.h>
-
-#ifdef MHRC
-# include <pwd.h>
-#endif
+#include <stdio.h>
+#include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file
 #define nmhetcdir(file) NMHETCDIR#file
@@ -34,21 +32,16 @@ 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, '/')))
@@ -72,7 +65,6 @@ etcpath (char *file)
 	    if (access (epath, R_OK) != NOTOK)
 		return epath;	/* else fall */
 try_it:
-#endif /* MHRC */
 
 	default: 
 	    /* Check nmh Mail directory */
@@ -189,12 +181,6 @@ char *buildmimeproc = nmhbindir (/mhbuild);
 char *catproc = "/bin/cat";
 
 /*
- * mhl runs this program as a visual-end.
- */
-
-char *faceproc = NULL;
-
-/*
  * This program is usually called directly by users, but it is
  * also invoked by the post program to process an "Fcc", or by
  * comp/repl/forw/dist to refile a draft message.
@@ -202,6 +188,13 @@ char *faceproc = NULL;
 
 char *fileproc = nmhbindir (/refile);
 
+/*
+ * This program is used to optionally format the bodies of messages by
+ * "mhl".
+ */
+
+char *formatproc = NULL;
+
 /* 
  * This program is called to incorporate messages into a folder.
  */
@@ -277,12 +270,6 @@ char *postproc = nmhlibdir (/post);
 char *rcvstoreproc = nmhlibdir (/rcvstore);
 
 /* 
- * This program is called to remove a folder.  
- */
-
-char *rmfproc = nmhbindir (/rmf);
-
-/* 
  * This program is called to remove a message by rmm or refile -nolink.
  * It's usually empty, which means to rename the file to a backup name.
  */
@@ -354,7 +341,7 @@ char *AliasFile = nmhetcdir (/MailAliases);
  * Folders (directories) are created with this protection (mode)
  */
 
-char *foldprot = DEFAULT_FOLDER_MODE;
+char *foldprot = "700";
 
 /*
  * Every NEW message will be created with this protection.  When a
@@ -362,5 +349,5 @@ char *foldprot = DEFAULT_FOLDER_MODE;
  * to messages coming in through inc.
  */
 
-char *msgprot = DEFAULT_MESSAGE_MODE;
+char *msgprot = "600";