From: markus schnalke <meillo@marmaro.de>
Date: Fri, 9 Dec 2011 16:17:50 +0000 (+0100)
Subject: Removed the option to disable `~user' support (MHRC)
X-Git-Tag: mmh-thesis-end~465
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=aa2bd5081731e83a2cedba6f7f2be61cde201e7d;p=mmh

Removed the option to disable `~user' support (MHRC)
---

diff --git a/acconfig.h b/acconfig.h
index c8882cb..f3d9ca3 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -70,11 +70,6 @@
 #define SLOCAL_MBOX  1
 
 /*
- * If this is defined, nmh will recognize the ~ construct.
- */
-#define MHRC    1
-
-/*
  * Compile simple ftp client into mhshow/mhstore.  This will be used by
  * mhshow/mhstore for ftp access unless you have specified another access
  * method in your .mh_profile or mhn.defaults.  Use the "nmh-access-ftp"
diff --git a/config/config.c b/config/config.c
index cc12128..245ecde 100644
--- 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;