X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pager.c;h=2a8d836bc05f07da77e1507c1bb3c84eb1e7cbcc;hp=d68d0411292422f65c5f5708a4b4f1f8c7814e3b;hb=d04295aaf918032c1c2fafc94ddf637cf23341e9;hpb=c25bc063f35aaad6938c2022dae7a283346c2769 diff --git a/pager.c b/pager.c index d68d041..2a8d836 100644 --- a/pager.c +++ b/pager.c @@ -15,12 +15,27 @@ # include "config.h" #endif +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + #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" @@ -31,25 +46,10 @@ #include "mx.h" -#ifdef USE_IMAP -#include "imap_private.h" -#endif +#include -#include "mutt_crypt.h" +#include -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" -#include "lib/rx.h" -#include "lib/debug.h" - -#include -#include -#include -#include -#include -#include -#include #define ISHEADER(x) ((x) == MT_COLOR_HEADER || (x) == MT_COLOR_HDEFAULT) @@ -312,7 +312,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; @@ -320,7 +320,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]; } @@ -339,8 +339,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)++; } @@ -353,8 +353,8 @@ static void cleanup_quote (struct q_class_t **QuoteList) cleanup_quote (&((*QuoteList)->down)); ptr = (*QuoteList)->next; if ((*QuoteList)->prefix) - mem_free (&(*QuoteList)->prefix); - mem_free (QuoteList); + p_delete(&(*QuoteList)->prefix); + p_delete(QuoteList); *QuoteList = ptr; } @@ -369,13 +369,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; } @@ -389,17 +389,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 */ @@ -424,7 +422,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; @@ -457,7 +455,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; @@ -478,7 +476,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; @@ -490,7 +488,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) @@ -499,11 +497,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 */ @@ -527,7 +522,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; @@ -556,7 +551,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; @@ -574,7 +569,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; @@ -596,10 +591,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) { @@ -614,8 +607,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; } @@ -630,9 +623,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); @@ -643,8 +635,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; } @@ -655,7 +647,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) { @@ -685,17 +677,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; @@ -706,7 +698,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; } @@ -770,9 +762,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; @@ -894,9 +884,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) @@ -911,7 +901,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; @@ -990,7 +980,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 */ @@ -1153,12 +1143,12 @@ 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 = mem_malloc (sizeof (struct syntax_t)); + (*lineInfo)[ch].syntax = p_new(struct syntax_t, 1); ((*lineInfo)[ch].syntax)[0].first = ((*lineInfo)[ch].syntax)[0].last = -1; } @@ -1230,10 +1220,9 @@ 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 = mem_malloc (sizeof (struct syntax_t)); + (*lineInfo)[n].search = p_new(struct syntax_t, 1); pmatch[0].rm_so += offset; pmatch[0].rm_eo += offset; ((*lineInfo)[n].search)[(*lineInfo)[n].search_cnt - 1].first = @@ -1437,7 +1426,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 */ @@ -1470,18 +1459,18 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) mutt_set_flag (Context, extra->hdr, M_READ, 1); } - lineInfo = mem_malloc (sizeof (struct line_t) * (maxLine = LINES)); + 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 = mem_malloc (sizeof (struct syntax_t)); + lineInfo[i].syntax = p_new(struct syntax_t, 1); (lineInfo[i].syntax)[0].first = (lineInfo[i].syntax)[0].last = -1; } 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 @@ -1491,17 +1480,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); @@ -1553,36 +1539,36 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) lines = Resize->line; redraw |= REDRAW_SIGWINCH; - mem_free (&Resize); + p_delete(&Resize); } #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,13 +1662,13 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) if (redraw & REDRAW_SIDEBAR) sidebar_draw (MENU_PAGER); - 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); + menu_redraw_current (pager_index); sidebar_draw (MENU_PAGER); - /* print out the index status bar */ - menu_status_line (buffer, sizeof (buffer), index, NONULL (Status)); + /* 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); @@ -1736,7 +1722,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) lines++; if (flags & M_PAGER_RETWINCH) { - Resize = mem_malloc (sizeof (struct resize)); + Resize = p_new(struct resize, 1); Resize->line = lines; Resize->SearchCompiled = SearchCompiled; @@ -1754,9 +1740,9 @@ 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) - mem_free (&(lineInfo[i].search)); + p_delete(&(lineInfo[i].search)); } lastLine = 0; @@ -1899,7 +1885,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) @@ -1920,7 +1906,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) @@ -1932,7 +1918,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) regfree (&SearchRE); for (i = 0; i < lastLine; i++) { if (lineInfo[i].search) - mem_free (&(lineInfo[i].search)); + p_delete(&(lineInfo[i].search)); lineInfo[i].search_cnt = -1; } } @@ -1946,7 +1932,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) for (i = 0; i < maxLine; i++) { /* cleanup */ if (lineInfo[i].search) - mem_free (&(lineInfo[i].search)); + p_delete(&(lineInfo[i].search)); lineInfo[i].search_cnt = -1; } SearchFlag = 0; @@ -2122,8 +2108,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; @@ -2207,9 +2191,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 || @@ -2236,9 +2220,9 @@ 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) - mem_free (&(lineInfo[i].search)); + p_delete(&(lineInfo[i].search)); } if (SearchCompiled) { @@ -2352,7 +2336,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 @@ -2429,11 +2413,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, @@ -2445,10 +2424,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) || @@ -2574,10 +2549,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); @@ -2590,10 +2561,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; @@ -2627,16 +2594,16 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) cleanup_quote (&QuoteList); for (i = 0; i < maxLine; i++) { - mem_free (&(lineInfo[i].syntax)); + p_delete(&(lineInfo[i].syntax)); if (SearchCompiled && lineInfo[i].search) - mem_free (&(lineInfo[i].search)); + p_delete(&(lineInfo[i].search)); } if (SearchCompiled) { regfree (&SearchRE); SearchCompiled = 0; } - mem_free (&lineInfo); - if (index) - mutt_menuDestroy (&index); + p_delete(&lineInfo); + if (pager_index) + mutt_menuDestroy (&pager_index); return (rc != -1 ? rc : 0); }