about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Src/system.h4
-rw-r--r--Src/utils.c4
3 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a3ec84c3..ff07b6461 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-09-17  Clint Adams  <schizo@debian.org>
 
+	* unposted: Src/system.h, Src/utils.c: define mailstat()
+	as a macro if MAILDIR_SUPPORT is undefined.
+
 	* 12823: Src/builtin.c, Src/utils.c: use zsh heap instead of
 	permanent heap.
 
diff --git a/Src/system.h b/Src/system.h
index fc85efdb4..80feebc05 100644
--- a/Src/system.h
+++ b/Src/system.h
@@ -673,3 +673,7 @@ extern short ospeed;
 #if defined(CONFIG_LOCALE) && defined(HAVE_SETLOCALE) && defined(LC_ALL)
 # define USE_LOCALE 1
 #endif /* CONFIG_LOCALE && HAVE_SETLOCALE && LC_ALL */
+
+#ifndef MAILDIR_SUPPORT
+#define mailstat(X,Y) stat(X,Y)
+#endif
diff --git a/Src/utils.c b/Src/utils.c
index e503b6844..ca46fd870 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -725,11 +725,7 @@ checkmailpath(char **s)
 	if (**s == 0) {
 	    *v = c;
 	    zerr("empty MAILPATH component: %s", *s, 0);
-#ifndef MAILDIR_SUPPORT
-	} else if (stat(unmeta(*s), &st) == -1) {
-#else
 	} else if (mailstat(unmeta(*s), &st) == -1) {
-#endif
 	    if (errno != ENOENT)
 		zerr("%e: %s", *s, errno);
 	} else if (S_ISDIR(st.st_mode)) {