X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pager.c;h=b83eaaf06c0bc26873326837d79631df8da49e05;hp=c3800dfe4e92712dadbddcdb811e703f79584bfe;hb=98cf5779d8184a74541be1bc61d15c5f35efd310;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a

diff --git a/pager.c b/pager.c
index c3800df..b83eaaf 100644
--- a/pager.c
+++ b/pager.c
@@ -11,47 +11,28 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <lib-lib/mem.h>
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+#include <lib-ui/sidebar.h>
 
 #include "mutt.h"
-#include "enter.h"
-#include "mutt_curses.h"
+#include "alias.h"
 #include "keymap.h"
-#include "mutt_menu.h"
-#include "mapping.h"
 #include "sort.h"
 #include "pager.h"
 #include "attach.h"
 #include "recvattach.h"
-#include "mbyte.h"
-#include "sidebar.h"
+#include "charset.h"
 #include "buffy.h"
 
 #include "mx.h"
 
-#ifdef USE_IMAP
-#include "imap_private.h"
-#endif
-
-#include "mutt_crypt.h"
+#include <imap/imap_private.h>
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
-#include "lib/rx.h"
-#include "lib/debug.h"
-
-#include <wchar.h>
-#include <sys/stat.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#include <lib-crypt/crypt.h>
 
 #define ISHEADER(x) ((x) == MT_COLOR_HEADER || (x) == MT_COLOR_HDEFAULT)
 
@@ -314,7 +295,7 @@ static void new_class_color (struct q_class_t *class, int *q_level)
 
 static void
 shift_class_colors (struct q_class_t *QuoteList, struct q_class_t *new_class,
-                    int index, int *q_level)
+                    int lindex, int *q_level)
 {
   struct q_class_t *q_list;
 
@@ -322,7 +303,7 @@ shift_class_colors (struct q_class_t *QuoteList, struct q_class_t *new_class,
   new_class->index = -1;
 
   while (q_list) {
-    if (q_list->index >= index) {
+    if (q_list->index >= lindex) {
       q_list->index++;
       q_list->color = ColorQuote[q_list->index % ColorQuoteUsed];
     }
@@ -341,8 +322,8 @@ shift_class_colors (struct q_class_t *QuoteList, struct q_class_t *new_class,
     }
   }
 
-  new_class->index = index;
-  new_class->color = ColorQuote[index % ColorQuoteUsed];
+  new_class->index = lindex;
+  new_class->color = ColorQuote[lindex % ColorQuoteUsed];
   (*q_level)++;
 }
 
@@ -371,13 +352,13 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
   struct q_class_t *class = NULL, *tmp = NULL, *ptr, *save;
   char *tail_qptr;
   int offset, tail_lng;
-  int index = -1;
+  int lindex = -1;
 
   if (ColorQuoteUsed <= 1) {
     /* not much point in classifying quotes... */
 
     if (*QuoteList == NULL) {
-      class = (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t));
+      class = p_new(struct q_class_t, 1);
       class->color = ColorQuote[0];
       *QuoteList = class;
     }
@@ -391,17 +372,15 @@ 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 */
 
         /* found shorter prefix */
         if (tmp == NULL) {
           /* add a node above q_list */
-          tmp =
-            (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t));
-          tmp->prefix = (char *) mem_calloc (1, length + 1);
-          strncpy (tmp->prefix, qptr, length);
+          tmp = p_new(struct q_class_t, 1);
+          tmp->prefix = p_dupstr(qptr, length);
           tmp->length = length;
 
           /* replace q_list by tmp in the top level list */
@@ -426,7 +405,7 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
           if (q_list == *QuoteList)
             *QuoteList = tmp;
 
-          index = q_list->index;
+          lindex = q_list->index;
 
           /* tmp should be the return class too */
           class = tmp;
@@ -459,7 +438,7 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
           q_list->prev = ptr;
           q_list->up = tmp;
 
-          index = q_list->index;
+          lindex = q_list->index;
 
           /* next class to test; as above, we shouldn't go down */
           q_list = save;
@@ -480,7 +459,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;
@@ -492,7 +471,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)
@@ -501,11 +480,8 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
               /* found shorter common prefix */
               if (tmp == NULL) {
                 /* add a node above q_list */
-                tmp = (struct q_class_t *) mem_calloc (1,
-                                                        sizeof (struct
-                                                                q_class_t));
-                tmp->prefix = (char *) mem_calloc (1, length + 1);
-                strncpy (tmp->prefix, qptr, length);
+                tmp = p_new(struct q_class_t, 1);
+                tmp->prefix = p_dupstr(qptr, length);
                 tmp->length = length;
 
                 /* replace q_list by tmp */
@@ -529,7 +505,7 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
                 q_list->next = NULL;
                 q_list->prev = NULL;
 
-                index = q_list->index;
+                lindex = q_list->index;
 
                 /* tmp should be the return class too */
                 class = tmp;
@@ -558,7 +534,7 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
                 q_list->prev = ptr;
                 q_list->up = tmp;
 
-                index = q_list->index;
+                lindex = q_list->index;
 
                 /* next class to test */
                 q_list = save;
@@ -576,7 +552,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;
@@ -598,10 +574,8 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
 
         /* still not found so far: add it as a sibling to the current node */
         if (class == NULL) {
-          tmp =
-            (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t));
-          tmp->prefix = (char *) mem_calloc (1, length + 1);
-          strncpy (tmp->prefix, qptr, length);
+          tmp = p_new(struct q_class_t, 1);
+          tmp->prefix = p_dupstr(qptr, length);
           tmp->length = length;
 
           if (ptr->down) {
@@ -616,8 +590,8 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
           return tmp;
         }
         else {
-          if (index != -1)
-            shift_class_colors (*QuoteList, tmp, index, q_level);
+          if (lindex != -1)
+            shift_class_colors (*QuoteList, tmp, lindex, q_level);
 
           return class;
         }
@@ -632,9 +606,8 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
 
   if (class == NULL) {
     /* not found so far: add it as a top level class */
-    class = (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t));
-    class->prefix = (char *) mem_calloc (1, length + 1);
-    strncpy (class->prefix, qptr, length);
+    class = p_new(struct q_class_t, 1);
+    class->prefix = p_dupstr(qptr, length);
     class->length = length;
     new_class_color (class, q_level);
 
@@ -645,8 +618,8 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
     *QuoteList = class;
   }
 
-  if (index != -1)
-    shift_class_colors (*QuoteList, tmp, index, q_level);
+  if (lindex != -1)
+    shift_class_colors (*QuoteList, tmp, lindex, q_level);
 
   return class;
 }
@@ -657,7 +630,7 @@ static int brailleCol = -1;
 static int check_attachment_marker (char *);
 
 static void
-resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last,
+resolve_types (char *buf, char *rawbuf, struct line_t *lineInfo, int n, int last,
                struct q_class_t **QuoteList, int *q_level, int *force_redraw,
                int q_classify)
 {
@@ -687,17 +660,17 @@ 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", rawbuf, 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)
+  else if (check_attachment_marker ((char *) rawbuf) == 0)
     lineInfo[n].type = MT_COLOR_ATTACHMENT;
 #endif
-  else if (str_cmp ("-- \n", buf) == 0
-           || str_cmp ("-- \r\n", buf) == 0) {
+  else if (m_strcmp("-- \n", buf) == 0
+           || m_strcmp("-- \r\n", buf) == 0) {
     i = n + 1;
 
     lineInfo[n].type = MT_COLOR_SIGNATURE;
@@ -708,7 +681,7 @@ resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last,
       /* oops... */
       if (lineInfo[i].chunks) {
         lineInfo[i].chunks = 0;
-        mem_realloc (&(lineInfo[n].syntax), sizeof (struct syntax_t));
+        p_realloc(&(lineInfo[n].syntax), 1);
       }
       lineInfo[i++].type = MT_COLOR_SIGNATURE;
     }
@@ -772,9 +745,7 @@ resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last,
           if (pmatch[0].rm_eo != pmatch[0].rm_so) {
             if (!found) {
               if (++(lineInfo[n].chunks) > 1)
-                mem_realloc (&(lineInfo[n].syntax),
-                              (lineInfo[n].chunks) *
-                              sizeof (struct syntax_t));
+                p_realloc(&(lineInfo[n].syntax), lineInfo[n].chunks);
             }
             i = lineInfo[n].chunks - 1;
             pmatch[0].rm_so += offset;
@@ -896,9 +867,9 @@ static int grok_ansi (unsigned char *buf, int pos, ansi_attr * a)
 /* trim tail of buf so that it contains complete multibyte characters */
 static int trim_incomplete_mbyte(unsigned char *buf, size_t len) {
   mbstate_t mbstate;
-  size_t k;
+  ssize_t k;
 
-  memset (&mbstate, 0, sizeof (mbstate));
+  p_clear(&mbstate, 1);
   for (; len > 0; buf += k, len -= k) {
     k = mbrtowc (NULL, (char *) buf, len, &mbstate);
     if (k == -2) 
@@ -913,7 +884,7 @@ static int trim_incomplete_mbyte(unsigned char *buf, size_t len) {
 
 static int
 fill_buffer (FILE * f, off_t *last_pos, off_t offset, unsigned char *buf,
-             unsigned char *fmt, size_t blen, int *buf_ready)
+             unsigned char *fmt, ssize_t blen, int *buf_ready)
 {
   unsigned char *p;
   static int b_read = 0;
@@ -954,7 +925,6 @@ fill_buffer (FILE * f, off_t *last_pos, off_t offset, unsigned char *buf,
       }
       else if (*p == '\033' && *(p + 1) == ']'
                && check_attachment_marker ((char *) p) == 0) {
-        debug_print (2, ("seen attachment marker.\n"));
         while (*p++ != '\a')    /* skip pseudo-ANSI sequence */
           ;
       }
@@ -992,7 +962,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
     wrap_cols = COLS;
 
   /* FIXME: this should come from lineInfo */
-  memset (&mbstate, 0, sizeof (mbstate));
+  p_clear(&mbstate, 1);
 
   for (ch = 0, vch = 0; ch < cnt; ch += k, vch += k) {
     /* Handle ANSI sequences */
@@ -1013,7 +983,6 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
 
     k = mbrtowc (&wc, (char *) buf + ch, cnt - ch, &mbstate);
     if (k == -2 || k == -1) {
-      debug_print (1, ("mbrtowc returned %d; errno = %d.\n", k, errno));
       if (col + 4 > wrap_cols)
         break;
       col += 4;
@@ -1027,7 +996,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
 
     /* Handle backspace */
     special = 0;
-    if (IsWPrint (wc)) {
+    if (iswprint(wc)) {
       wchar_t wc1;
       mbstate_t mbstate1;
       int k1, k2;
@@ -1038,7 +1007,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
                            &mbstate1), k1 - k > 0 && wc1 == '\b')
              && (wc1 = 0, k2 =
                  mbrtowc (&wc1, (char *) buf + ch + k1, cnt - ch - k1,
-                          &mbstate1), k2 > 0 && IsWPrint (wc1))) {
+                          &mbstate1), k2 > 0 && iswprint(wc1))) {
         if (wc == wc1) {
           special |= (wc == '_' && special & A_UNDERLINE)
             ? A_UNDERLINE : A_BOLD;
@@ -1064,7 +1033,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
       last_special = special;
     }
 
-    if (IsWPrint (wc)) {
+    if (iswprint(wc)) {
       if (wc == ' ')
         space = ch;
       t = wcwidth (wc);
@@ -1106,7 +1075,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
         break;
       ++col;
       if (pa)
-        addch (replacement_char ());
+        addch (CharsetReplacement);
     }
   }
   *pspace = space;
@@ -1155,9 +1124,9 @@ display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n,
   }
 
   if (*last == *max) {
-    mem_realloc (lineInfo, sizeof (struct line_t) * (*max += LINES));
+    p_realloc(lineInfo, *max += LINES);
     for (ch = *last; ch < *max; ch++) {
-      memset (&((*lineInfo)[ch]), 0, sizeof (struct line_t));
+      p_clear(&(*lineInfo)[ch], 1);
       (*lineInfo)[ch].type = -1;
       (*lineInfo)[ch].search_cnt = -1;
       (*lineInfo)[ch].syntax = p_new(struct syntax_t, 1);
@@ -1232,8 +1201,7 @@ display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n,
            (SearchRE, (char *) fmt + offset, 1, pmatch,
             (offset ? REG_NOTBOL : 0)) == 0) {
       if (++((*lineInfo)[n].search_cnt) > 1)
-        mem_realloc (&((*lineInfo)[n].search),
-                      ((*lineInfo)[n].search_cnt) * sizeof (struct syntax_t));
+        p_realloc(&(*lineInfo)[n].search, (*lineInfo)[n].search_cnt);
       else
         (*lineInfo)[n].search = p_new(struct syntax_t, 1);
       pmatch[0].rm_so += offset;
@@ -1439,7 +1407,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
   int helpoffset = LINES - 2;   /* offset for the help bar. */
   int bodylen = LINES - 2 - bodyoffset; /* length of displayable area */
 
-  MUTTMENU *index = NULL;       /* the Pager Index (PI) */
+  MUTTMENU *pager_index = NULL;       /* the Pager Index (PI) */
   int indexoffset = 0;          /* offset for the PI */
   int indexlen = PagerIndexLines;       /* indexlen not always == PIL */
   int indicator = indexlen / 3; /* the indicator line of the PI */
@@ -1474,7 +1442,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 
   lineInfo = p_new(struct line_t, maxLine = LINES);
   for (i = 0; i < maxLine; i++) {
-    memset (&lineInfo[i], 0, sizeof (struct line_t));
+    p_clear(&lineInfo[i], 1);
     lineInfo[i].type = -1;
     lineInfo[i].search_cnt = -1;
     lineInfo[i].syntax = p_new(struct syntax_t, 1);
@@ -1483,7 +1451,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
@@ -1493,17 +1461,14 @@ 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);
   }
 
   while (ch != -1) {
     mutt_curs_set (0);
-
-#ifdef USE_IMAP
     imap_keepalive ();
-#endif
 
     if (redraw & REDRAW_FULL) {
       SETCOLOR (MT_COLOR_NORMAL);
@@ -1560,31 +1525,31 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 #endif
 
       if (IsHeader (extra) && PagerIndexLines) {
-        if (index == NULL) {
+        if (pager_index == NULL) {
           /* only allocate the space if/when we need the index.
              Initialise the menu as per the main index */
-          index = mutt_new_menu ();
-          index->menu = MENU_MAIN;
-          index->make_entry = index_make_entry;
-          index->color = index_color;
-          index->max = Context->vcount;
-          index->current = extra->hdr->virtual;
+          pager_index = mutt_new_menu ();
+          pager_index->menu = MENU_MAIN;
+          pager_index->make_entry = index_make_entry;
+          pager_index->color = index_color;
+          pager_index->max = Context->vcount;
+          pager_index->current = extra->hdr->virtual;
         }
 
         SETCOLOR (MT_COLOR_NORMAL);
-        index->offset = indexoffset + (option (OPTSTATUSONTOP) ? 1 : 0);
+        pager_index->offset = indexoffset + (option (OPTSTATUSONTOP) ? 1 : 0);
 
-        index->pagelen = indexlen - 1;
+        pager_index->pagelen = indexlen - 1;
 
         /* some fudge to work out where abouts the indicator should go */
-        if (index->current - indicator < 0)
-          index->top = 0;
-        else if (index->max - index->current < index->pagelen - indicator)
-          index->top = index->max - index->pagelen;
+        if (pager_index->current - indicator < 0)
+          pager_index->top = 0;
+        else if (pager_index->max - pager_index->current < pager_index->pagelen - indicator)
+          pager_index->top = pager_index->max - pager_index->pagelen;
         else
-          index->top = index->current - indicator;
+          pager_index->top = pager_index->current - indicator;
 
-        menu_redraw_index (index);
+        menu_redraw_index (pager_index);
       }
 
       redraw |= REDRAW_BODY | REDRAW_INDEX | REDRAW_STATUS;
@@ -1676,15 +1641,15 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
     }
 
     if (redraw & REDRAW_SIDEBAR)
-      sidebar_draw (MENU_PAGER);
+      sidebar_draw ();
 
-    if ((redraw & REDRAW_INDEX) && index) {
+    if ((redraw & REDRAW_INDEX) && pager_index) {
       /* redraw the pager_index indicator, because the
        * flags for this message might have changed. */
-      menu_redraw_current (index);
-      sidebar_draw (MENU_PAGER);
-      /* print out the index status bar */
-      menu_status_line (buffer, sizeof (buffer), index, NONULL (Status));
+      menu_redraw_current (pager_index);
+      sidebar_draw ();
+      /* print out the pager_index status bar */
+      menu_status_line (buffer, sizeof (buffer), pager_index, NONULL (Status));
       move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), SW);
       SETCOLOR (MT_COLOR_STATUS);
       BKGDSET (MT_COLOR_STATUS);
@@ -1694,7 +1659,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
     }
     /* if we're not using the index, update every time */
     if (index == 0)
-      sidebar_draw (MENU_PAGER);
+      sidebar_draw ();
 
     redraw = 0;
 
@@ -1756,7 +1721,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
           lineInfo[i].search_cnt = -1;
           lineInfo[i].quote = NULL;
 
-          mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
+          p_realloc(&lineInfo[i].syntax, 1);
           if (SearchCompiled && lineInfo[i].search)
             p_delete(&(lineInfo[i].search));
         }
@@ -1901,7 +1866,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)
@@ -1922,7 +1887,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)
@@ -2124,8 +2089,6 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 
     case OP_CHECK_TRADITIONAL:
       CHECK_MODE (IsHeader (extra));
-      if (!(WithCrypto & APPLICATION_PGP))
-        break;
       if (!(extra->hdr->security & PGP_TRADITIONAL_CHECKED)) {
         ch = -1;
         rc = OP_CHECK_TRADITIONAL;
@@ -2209,9 +2172,9 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
       }
 
       if (old_PagerIndexLines != PagerIndexLines) {
-        if (index)
-          mutt_menuDestroy (&index);
-        index = NULL;
+        if (pager_index)
+          mutt_menuDestroy (&pager_index);
+        pager_index = NULL;
       }
 
       if (option (OPTWRAP) != old_smart_wrap ||
@@ -2238,7 +2201,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
           lineInfo[i].search_cnt = -1;
           lineInfo[i].quote = NULL;
 
-          mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
+          p_realloc(&(lineInfo[i].syntax), 1);
           if (SearchCompiled && lineInfo[i].search)
             p_delete(&(lineInfo[i].search));
         }
@@ -2354,7 +2317,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
@@ -2431,11 +2394,6 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
       break;
 
     case OP_DECRYPT_SAVE:
-      if (!WithCrypto) {
-        ch = -1;
-        break;
-      }
-      /* fall through */
     case OP_SAVE:
       if (IsAttach (extra)) {
         mutt_save_attachment_list (extra->fp, 0, extra->bdy, extra->hdr,
@@ -2447,10 +2405,6 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
     case OP_DECODE_SAVE:
     case OP_DECODE_COPY:
     case OP_DECRYPT_COPY:
-      if (!WithCrypto && ch == OP_DECRYPT_COPY) {
-        ch = -1;
-        break;
-      }
       CHECK_MODE (IsHeader (extra));
       if (mutt_save_message (extra->hdr,
                              (ch == OP_DECRYPT_SAVE) ||
@@ -2576,10 +2530,6 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 
 
     case OP_MAIL_KEY:
-      if (!(WithCrypto & APPLICATION_PGP)) {
-        ch = -1;
-        break;
-      }
       CHECK_MODE (IsHeader (extra));
       CHECK_ATTACH;
       ci_send_message (SENDKEY, NULL, NULL, extra->ctx, extra->hdr);
@@ -2592,10 +2542,6 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
       break;
 
     case OP_EXTRACT_KEYS:
-      if (!WithCrypto) {
-        ch = -1;
-        break;
-      }
       CHECK_MODE (IsHeader (extra));
       crypt_extract_keys_from_messages (extra->hdr);
       redraw = REDRAW_FULL;
@@ -2607,7 +2553,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
     case OP_SIDEBAR_NEXT_NEW:
     case OP_SIDEBAR_PREV:
     case OP_SIDEBAR_PREV_NEW:
-      sidebar_scroll (ch, MENU_PAGER);
+      sidebar_scroll (ch);
       break;
     default:
       ch = -1;
@@ -2638,7 +2584,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
     SearchCompiled = 0;
   }
   p_delete(&lineInfo);
-  if (index)
-    mutt_menuDestroy (&index);
+  if (pager_index)
+    mutt_menuDestroy (&pager_index);
   return (rc != -1 ? rc : 0);
 }