From 9680f38826145311f8720dab2d19d3796e8514ee Mon Sep 17 00:00:00 2001 From: Ken Hornstein Date: Fri, 6 Jan 2012 10:37:38 -0500 Subject: [PATCH] Garbage-collect MHRC (and make it the default). --- acconfig.h | 5 ----- config/config.c | 11 +---------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/acconfig.h b/acconfig.h index ce6b5c4..a326761 100644 --- a/acconfig.h +++ b/acconfig.h @@ -26,11 +26,6 @@ /* #define REALLYDUMB 1 */ /* - * If this is defined, nmh will recognize the ~ construct. - */ -#define MHRC 1 - -/* * Compile simple ftp client into mhn. This will be used by mhn * for ftp access unless you have specified another access method * in your .mh_profile or mhn.defaults. Use the "mhn-access-ftp" diff --git a/config/config.c b/config/config.c index b08b3e2..a4edc46 100644 --- a/config/config.c +++ b/config/config.c @@ -9,10 +9,7 @@ #include #include - -#ifdef MHRC -# include -#endif +#include #define nmhbindir(file) NMHBINDIR#file #define nmhetcdir(file) NMHETCDIR#file @@ -35,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, '/'))) @@ -73,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 */ -- 1.7.10.4