[PATCH] version.h doesn't depend on Makefile.am

[apps/madmutt.git] / pager.c

diff --git a/pager.c b/pager.c
index 13f3908..965a85e 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -18,13 +18,13 @@
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/mapping.h>
 
 #include "mutt.h"
 #include "enter.h"
 #include "mutt_curses.h"
 #include "keymap.h"
 #include "mutt_menu.h"
-#include "mapping.h"
 #include "sort.h"
 #include "pager.h"
 #include "attach.h"
@@ -390,7 +390,7 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
     if (length <= q_list->length) {
       /* case 1: check the top level nodes */
 
-      if (str_ncmp (qptr, q_list->prefix, length) == 0) {
+      if (m_strncmp(qptr, q_list->prefix, length) == 0) {
         if (length == q_list->length)
           return q_list;        /* same prefix: return the current class */
 
@@ -477,7 +477,7 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
 
       /* tmp != NULL means we already found a shorter prefix at case 1 */
       if (tmp == NULL
-          && str_ncmp (qptr, q_list->prefix, q_list->length) == 0) {
+          && m_strncmp(qptr, q_list->prefix, q_list->length) == 0) {
         /* ok, it's a subclass somewhere on this branch */
 
         ptr = q_list;
@@ -489,7 +489,7 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
 
         while (q_list) {
           if (length <= q_list->length) {
-            if (str_ncmp (tail_qptr, (q_list->prefix) + offset, tail_lng)
+            if (m_strncmp(tail_qptr, (q_list->prefix) + offset, tail_lng)
                 == 0) {
               /* same prefix: return the current class */
               if (length == q_list->length)
@@ -570,7 +570,7 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
           else {
             /* longer than the current prefix: try subclassing it */
             if (tmp == NULL
-                && str_ncmp (tail_qptr, (q_list->prefix) + offset,
+                && m_strncmp(tail_qptr, (q_list->prefix) + offset,
                                  q_list->length - offset) == 0) {
               /* still a subclass: go down one level */
               ptr = q_list;
@@ -678,10 +678,10 @@ resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last,
       }
     }
   }
-  else if (str_ncmp ("\033[0m", raw, 4) == 0)       /* a little hack... */
+  else if (m_strncmp("\033[0m", raw, 4) == 0)       /* a little hack... */
     lineInfo[n].type = MT_COLOR_NORMAL;
 #if 0
-  else if (str_ncmp ("[-- ", buf, 4) == 0)
+  else if (m_strncmp("[-- ", buf, 4) == 0)
     lineInfo[n].type = MT_COLOR_ATTACHMENT;
 #else
   else if (check_attachment_marker ((char *) raw) == 0)
@@ -1471,7 +1471,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 
   mutt_compile_help (helpstr, sizeof (helpstr), MENU_PAGER, PagerHelp);
   if (IsHeader (extra)) {
-    strfcpy (tmphelp, helpstr, sizeof (tmphelp));
+    m_strcpy(tmphelp, sizeof(tmphelp), helpstr);
     mutt_compile_help (buffer, sizeof (buffer), MENU_PAGER,
 #ifdef USE_NNTP
                        (Context
@@ -1481,7 +1481,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
     snprintf (helpstr, sizeof (helpstr), "%s %s", tmphelp, buffer);
   }
   if (!InHelp) {
-    strfcpy (tmphelp, helpstr, sizeof (tmphelp));
+    m_strcpy(tmphelp, sizeof(tmphelp), helpstr);
     mutt_make_help (buffer, sizeof (buffer), _("Help"), MENU_PAGER, OP_HELP);
     snprintf (helpstr, sizeof (helpstr), "%s %s", tmphelp, buffer);
   }
@@ -1889,7 +1889,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 
     case OP_SEARCH:
     case OP_SEARCH_REVERSE:
-      strfcpy (buffer, searchbuf, sizeof (buffer));
+      m_strcpy(buffer, sizeof(buffer), searchbuf);
       if (mutt_get_field ((SearchBack ? _("Reverse search: ") :
                            _("Search: ")), buffer, sizeof (buffer),
                           M_CLEAR) != 0)
@@ -1910,7 +1910,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
       if (!buffer[0])
         break;
 
-      strfcpy (searchbuf, buffer, sizeof (searchbuf));
+      m_strcpy(searchbuf, sizeof(searchbuf), buffer);
 
       /* leave SearchBack alone if ch == OP_SEARCH_NEXT */
       if (ch == OP_SEARCH)
@@ -2342,7 +2342,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
       else
         followup_to = extra->hdr->env->followup_to;
 
-      if (!followup_to || str_casecmp (followup_to, "poster") ||
+      if (!followup_to || m_strcasecmp(followup_to, "poster") ||
           query_quadoption (OPT_FOLLOWUPTOPOSTER,
                             _("Reply by mail as poster prefers?")) != M_YES) {
         if (extra->ctx && extra->ctx->magic == M_NNTP