X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d24647ed2194c1907905665a14b67363528571a4..73f954e053fc4bdf969a1ce415e7aaf4c68ff551:/sbr/m_maildir.c

diff --git a/sbr/m_maildir.c b/sbr/m_maildir.c
index 13bea089..a4f2af57 100644
--- a/sbr/m_maildir.c
+++ b/sbr/m_maildir.c
@@ -8,13 +8,12 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 #define	CWD	"./"
-#define	NCWD	(sizeof(CWD) - 1)
 #define	DOT	"."
 #define	DOTDOT	".."
 #define	PWD	"../"
-#define	NPWD	(sizeof(PWD) - 1)
 
 static char mailfold[BUFSIZ];
 
@@ -45,10 +44,10 @@ m_mailpath (char *folder)
     char maildir[BUFSIZ];
 
     if (*folder != '/'
-	    && strncmp (folder, CWD, NCWD)
+	    && !HasPrefix(folder, CWD)
 	    && strcmp (folder, DOT)
 	    && strcmp (folder, DOTDOT)
-	    && strncmp (folder, PWD, NPWD)) {
+	    && !HasPrefix(folder, PWD)) {
 	strncpy (maildir, mailfold, sizeof(maildir));	/* preserve... */
 	cp = getcpy (m_maildir (folder));
 	strncpy (mailfold, maildir, sizeof(mailfold));
@@ -70,10 +69,10 @@ exmaildir (char *folder)
 	folder = getfolder(1);
 
     if (!(*folder != '/'
-	    && strncmp (folder, CWD, NCWD)
+	    && !HasPrefix(folder, CWD)
 	    && strcmp (folder, DOT)
 	    && strcmp (folder, DOTDOT)
-	    && strncmp (folder, PWD, NPWD))) {
+	    && !HasPrefix(folder, PWD))) {
 	strncpy (mailfold, folder, sizeof(mailfold));
 	return mailfold;
     }