From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Sun, 23 Oct 2016 21:47:08 +0000 (+0100)
Subject: Use HasPrefix() instead of strncmp().
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/0c9b09a8a9fca687adf2859976fba7df439ab000?hp=461317c8fb5ec758fd77d2d7450ca3cd94fc58c2

Use HasPrefix() instead of strncmp().
---

diff --git a/sbr/m_maildir.c b/sbr/m_maildir.c
index 13bea089..c574c161 100644
--- a/sbr/m_maildir.c
+++ b/sbr/m_maildir.c
@@ -8,6 +8,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 #define	CWD	"./"
 #define	NCWD	(sizeof(CWD) - 1)
@@ -45,10 +46,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 +71,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;
     }