From: Pietro Cerutti <gahr@gahr.ch>
Date: Fri, 9 Nov 2018 15:08:47 +0000 (+0000)
Subject: mutt_str_startswith - email/from.c
X-Git-Tag: 2019-10-25~532^2~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=790e49be8e9102d2735c7d290e67d02b6ad1b7e9;p=neomutt

mutt_str_startswith - email/from.c
---

diff --git a/email/from.c b/email/from.c
index 0f7686636..dc9b12b4e 100644
--- a/email/from.c
+++ b/email/from.c
@@ -54,7 +54,7 @@ bool is_from(const char *s, char *path, size_t pathlen, time_t *tp)
   if (path)
     *path = '\0';
 
-  if (mutt_str_strncmp("From ", s, 5) != 0)
+  if (!mutt_str_startswith(s, "From ", CASE_MATCH))
     return false;
 
   s = mutt_str_next_word(s); /* skip over the From part. */
@@ -85,9 +85,10 @@ bool is_from(const char *s, char *path, size_t pathlen, time_t *tp)
       return false;
 
     /* pipermail archives have the return_path obscured such as "me at neomutt.org" */
-    if (mutt_str_strncasecmp(p, " at ", 4) == 0)
+    size_t plen = mutt_str_startswith(p, " at ", CASE_IGNORE);
+    if (plen != 0)
     {
-      p = strchr(p + 4, ' ');
+      p = strchr(p + plen, ' ');
       if (!p)
       {
         mutt_debug(1,