projects
/
mmh
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aac9670
)
Garbage-collect MHRC (and make it the default).
author
Ken Hornstein
<kenh@pobox.com>
Fri, 6 Jan 2012 15:37:38 +0000
(10:37 -0500)
committer
Ken Hornstein
<kenh@pobox.com>
Fri, 6 Jan 2012 15:37:38 +0000
(10:37 -0500)
acconfig.h
patch
|
blob
|
history
config/config.c
patch
|
blob
|
history
diff --git
a/acconfig.h
b/acconfig.h
index
ce6b5c4
..
a326761
100644
(file)
--- a/
acconfig.h
+++ b/
acconfig.h
@@
-26,11
+26,6
@@
/* #define REALLYDUMB 1 */
/*
/* #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"
* 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
(file)
--- a/
config/config.c
+++ b/
config/config.c
@@
-9,10
+9,7
@@
#include <h/mh.h>
#include <stdio.h>
#include <h/mh.h>
#include <stdio.h>
-
-#ifdef MHRC
-# include <pwd.h>
-#endif
+#include <pwd.h>
#define nmhbindir(file) NMHBINDIR#file
#define nmhetcdir(file) NMHETCDIR#file
#define nmhbindir(file) NMHBINDIR#file
#define nmhetcdir(file) NMHETCDIR#file
@@
-35,21
+32,16
@@
etcpath (char *file)
{
static char epath[PATH_MAX];
char *cp;
{
static char epath[PATH_MAX];
char *cp;
-#ifdef MHRC
char *pp;
struct passwd *pw;
char *pp;
struct passwd *pw;
-#endif
-#ifdef MHRC
context_read();
context_read();
-#endif
switch (*file) {
case '/':
/* If already absolute pathname, return it */
return file;
switch (*file) {
case '/':
/* If already absolute pathname, return it */
return file;
-#ifdef MHRC
case '~':
/* Expand ~username */
if ((cp = strchr(pp = file + 1, '/')))
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:
if (access (epath, R_OK) != NOTOK)
return epath; /* else fall */
try_it:
-#endif /* MHRC */
default:
/* Check nmh Mail directory */
default:
/* Check nmh Mail directory */