X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pager.c;h=5880834668f8d2c61facedef0d0b0cb8c51ce471;hp=0c9441f941a978f4fd98a56a208206e4b181a88b;hb=c855a6e8e9522ac9add840b18a869c831030f569;hpb=8476307969a605bea67f6b702b0c1e7a52038bed diff --git a/pager.c b/pager.c index 0c9441f..5880834 100644 --- a/pager.c +++ b/pager.c @@ -20,6 +20,7 @@ #include #include "mutt.h" +#include "crypt.h" #include "alias.h" #include "keymap.h" #include "sort.h" @@ -29,50 +30,41 @@ #include "charset.h" #include "buffy.h" - #include -#include - #define ISHEADER(x) ((x) == MT_COLOR_HEADER || (x) == MT_COLOR_HDEFAULT) -#define IsAttach(x) (x && (x)->bdy) -#define IsRecvAttach(x) (x && (x)->bdy && (x)->fp) -#define IsSendAttach(x) (x && (x)->bdy && !(x)->fp) -#define IsMsgAttach(x) (x && (x)->fp && (x)->bdy && (x)->bdy->hdr) -#define IsHeader(x) (x && (x)->hdr && !(x)->bdy) -#define SW (option(OPTMBOXPANE)?SidebarWidth:0) - -static const char *Not_available_in_this_menu = -N_("Not available in this menu."); -static const char *Mailbox_is_read_only = N_("Mailbox is read-only."); -static const char *Function_not_permitted_in_attach_message_mode = -N_("Function not permitted in attach-message mode."); +#define IsAttach(x) (x && (x)->bdy) +#define IsRecvAttach(x) (x && (x)->bdy && (x)->fp) +#define IsSendAttach(x) (x && (x)->bdy && !(x)->fp) +#define IsMsgAttach(x) (x && (x)->fp && (x)->bdy && (x)->bdy->hdr) +#define IsHeader(x) (x && (x)->hdr && !(x)->bdy) +#define SW (option(OPTMBOXPANE)?SidebarWidth:0) /* hack to return to position when returning from index to same message */ static int TopLine = 0; static HEADER *OldHdr = NULL; -#define CHECK_MODE(x) if (!(x)) \ - { \ - mutt_flushinp (); \ - mutt_error _(Not_available_in_this_menu); \ - break; \ - } - -#define CHECK_READONLY if (Context->readonly) \ - { \ - mutt_flushinp (); \ - mutt_error _(Mailbox_is_read_only); \ - break; \ - } - -#define CHECK_ATTACH if(option(OPTATTACHMSG)) \ - {\ - mutt_flushinp (); \ - mutt_error _(Function_not_permitted_in_attach_message_mode); \ - break; \ - } +#define CHECK_MODE(x) \ + if (!(x)) { \ + mutt_flushinp(); \ + mutt_error _("Not available in this menu."); \ + break; \ + } + +#define CHECK_READONLY \ + if (Context->readonly) { \ + mutt_flushinp(); \ + mutt_error _("Mailbox is read-only."); \ + break; \ + } + +#define CHECK_ATTACH \ + if (option(OPTATTACHMSG)) { \ + mutt_flushinp(); \ + mutt_error _("Function not permitted in attach-message mode."); \ + break; \ + } struct q_class_t { int length; @@ -121,37 +113,32 @@ static struct resize { int line; int SearchCompiled; int SearchBack; -} *Resize = NULL; +} *Resize = NULL; #endif #define NumSigLines 4 -static int check_sig (const char *s, struct line_t *info, int n) +static int check_sig(const char *s, struct line_t *info, int n) { - int count = 0; + int count = 0; - while (n > 0 && count <= NumSigLines) { - if (info[n].type != MT_COLOR_SIGNATURE) - break; - count++; - n--; - } + while (n > 0 && count <= NumSigLines) { + if (info[n].type != MT_COLOR_SIGNATURE) + break; + count++; + n--; + } - if (count == 0) - return (-1); + if (count == 0) + return -1; - if (count > NumSigLines) { - /* check for a blank line */ - while (*s) { - if (!ISSPACE (*s)) - return 0; - s++; + if (count > NumSigLines) { + /* check for a blank line */ + s = skipspaces(s); + return *s ? -1 : 0; } - return (-1); - } - - return (0); + return 0; } static void @@ -174,9 +161,10 @@ resolve_color (struct line_t *lineInfo, int n, int cnt, int flags, } m = (lineInfo[n].syntax)[0].first; cnt += (lineInfo[n].syntax)[0].last; - } - else + } else { m = n; + } + if (!(flags & M_SHOWCOLOR)) def_color = ColorDefs[MT_COLOR_NORMAL]; else if (lineInfo[m].type == MT_COLOR_HEADER) @@ -209,8 +197,7 @@ resolve_color (struct line_t *lineInfo, int n, int cnt, int flags, color = (lineInfo[m].syntax)[i].color; break; } - /* don't break here, as cnt might be - * in the next chunk as well */ + /* don't break here, as cnt might be in the next chunk as well */ } } @@ -230,16 +217,13 @@ resolve_color (struct line_t *lineInfo, int n, int cnt, int flags, /* handle "special" bold & underlined characters */ if (special || a->attr) { -#ifdef HAVE_COLOR if ((a->attr & ANSI_COLOR)) { if (a->pair == -1) a->pair = mutt_alloc_color (a->fg, a->bg); color = a->pair; if (a->attr & ANSI_BOLD) color |= A_BOLD; - } - else -#endif + } else if ((special & A_BOLD) || (a->attr & ANSI_BOLD)) { if (ColorDefs[MT_COLOR_BOLD] && !search) color = ColorDefs[MT_COLOR_BOLD]; @@ -274,354 +258,339 @@ static void append_line (struct line_t *lineInfo, int n, int cnt) int m; lineInfo[n + 1].type = lineInfo[n].type; - (lineInfo[n + 1].syntax)[0].color = (lineInfo[n].syntax)[0].color; + lineInfo[n + 1].syntax[0].color = lineInfo[n].syntax[0].color; lineInfo[n + 1].continuation = 1; /* find the real start of the line */ for (m = n; m >= 0; m--) - if (lineInfo[m].continuation == 0) - break; + if (lineInfo[m].continuation == 0) + break; (lineInfo[n + 1].syntax)[0].first = m; (lineInfo[n + 1].syntax)[0].last = (lineInfo[n].continuation) ? - cnt + (lineInfo[n].syntax)[0].last : cnt; + cnt + (lineInfo[n].syntax)[0].last : cnt; } static void new_class_color (struct q_class_t *class, int *q_level) { - class->index = (*q_level)++; - class->color = ColorQuote[class->index % ColorQuoteUsed]; + class->index = (*q_level)++; + class->color = ColorQuote[class->index % ColorQuoteUsed]; } static void shift_class_colors (struct q_class_t *QuoteList, struct q_class_t *new_class, int lindex, int *q_level) { - struct q_class_t *q_list; + struct q_class_t *q_list; - q_list = QuoteList; - new_class->index = -1; + q_list = QuoteList; + new_class->index = -1; - while (q_list) { - if (q_list->index >= lindex) { - q_list->index++; - q_list->color = ColorQuote[q_list->index % ColorQuoteUsed]; - } - if (q_list->down) - q_list = q_list->down; - else if (q_list->next) - q_list = q_list->next; - else { - while (!q_list->next) { - q_list = q_list->up; - if (q_list == NULL) - break; - } - if (q_list) - q_list = q_list->next; + while (q_list) { + if (q_list->index >= lindex) { + q_list->index++; + q_list->color = ColorQuote[q_list->index % ColorQuoteUsed]; + } + if (q_list->down) + q_list = q_list->down; + else if (q_list->next) + q_list = q_list->next; + else { + while (!q_list->next) { + q_list = q_list->up; + if (q_list == NULL) + break; + } + if (q_list) + q_list = q_list->next; + } } - } - new_class->index = lindex; - new_class->color = ColorQuote[lindex % ColorQuoteUsed]; - (*q_level)++; + new_class->index = lindex; + new_class->color = ColorQuote[lindex % ColorQuoteUsed]; + (*q_level)++; } -static void cleanup_quote (struct q_class_t **QuoteList) +static void cleanup_quote(struct q_class_t **QuoteList) { - struct q_class_t *ptr; - - while (*QuoteList) { - if ((*QuoteList)->down) - cleanup_quote (&((*QuoteList)->down)); - ptr = (*QuoteList)->next; - if ((*QuoteList)->prefix) - p_delete(&(*QuoteList)->prefix); - p_delete(QuoteList); - *QuoteList = ptr; - } - - return; + while (*QuoteList) { + struct q_class_t *ptr = (*QuoteList)->next; + cleanup_quote(&(*QuoteList)->down); + p_delete(&(*QuoteList)->prefix); + p_delete(QuoteList); + *QuoteList = ptr; + } } static struct q_class_t *classify_quote (struct q_class_t **QuoteList, const char *qptr, int length, int *force_redraw, int *q_level) { - struct q_class_t *q_list = *QuoteList; - struct q_class_t *class = NULL, *tmp = NULL, *ptr, *save; - char *tail_qptr; - int offset, tail_lng; - int lindex = -1; - - if (ColorQuoteUsed <= 1) { - /* not much point in classifying quotes... */ - - if (*QuoteList == NULL) { - class = p_new(struct q_class_t, 1); - class->color = ColorQuote[0]; - *QuoteList = class; - } - return (*QuoteList); - } - - /* Did I mention how much I like emulating Lisp in C? */ - - /* classify quoting prefix */ - while (q_list) { - if (length <= q_list->length) { - /* case 1: check the top level nodes */ - - 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 = 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 */ - if (q_list->next) { - tmp->next = q_list->next; - q_list->next->prev = tmp; - } - if (q_list->prev) { - tmp->prev = q_list->prev; - q_list->prev->next = tmp; - } - - /* make q_list a child of tmp */ - tmp->down = q_list; - q_list->up = tmp; - - /* q_list has no siblings for now */ - q_list->next = NULL; - q_list->prev = NULL; - - /* update the root if necessary */ - if (q_list == *QuoteList) - *QuoteList = tmp; - - lindex = q_list->index; - - /* tmp should be the return class too */ - class = tmp; - - /* next class to test; if tmp is a shorter prefix for another - * node, that node can only be in the top level list, so don't - * go down after this point - */ - q_list = tmp->next; + struct q_class_t *q_list = *QuoteList; + struct q_class_t *class = NULL, *tmp = NULL, *ptr, *save; + char *tail_qptr; + int offset, tail_lng; + int lindex = -1; + + if (ColorQuoteUsed <= 1) { + /* not much point in classifying quotes... */ + + if (*QuoteList == NULL) { + class = p_new(struct q_class_t, 1); + class->color = ColorQuote[0]; + *QuoteList = class; } - else { - /* found another branch for which tmp is a shorter prefix */ - - /* save the next sibling for later */ - save = q_list->next; - - /* unlink q_list from the top level list */ - if (q_list->next) - q_list->next->prev = q_list->prev; - if (q_list->prev) - q_list->prev->next = q_list->next; - - /* at this point, we have a tmp->down; link q_list to it */ - ptr = tmp->down; - /* sibling order is important here, q_list should be linked last */ - while (ptr->next) - ptr = ptr->next; - ptr->next = q_list; - q_list->next = NULL; - q_list->prev = ptr; - q_list->up = tmp; - - lindex = q_list->index; - - /* next class to test; as above, we shouldn't go down */ - q_list = save; - } - - /* we found a shorter prefix, so certain quotes have changed classes */ - *force_redraw = 1; - continue; - } - else { - /* shorter, but not a substring of the current class: try next */ - q_list = q_list->next; - continue; - } + return (*QuoteList); } - else { - /* case 2: try subclassing the current top level node */ - - /* tmp != NULL means we already found a shorter prefix at case 1 */ - if (tmp == NULL - && m_strncmp(qptr, q_list->prefix, q_list->length) == 0) { - /* ok, it's a subclass somewhere on this branch */ - - ptr = q_list; - offset = q_list->length; - - q_list = q_list->down; - tail_lng = length - offset; - tail_qptr = (char *) qptr + offset; - - while (q_list) { - if (length <= q_list->length) { - if (m_strncmp(tail_qptr, (q_list->prefix) + offset, tail_lng) - == 0) { - /* same prefix: return the current class */ - if (length == q_list->length) - return q_list; - - /* found shorter common prefix */ - if (tmp == NULL) { - /* add a node above q_list */ - tmp = p_new(struct q_class_t, 1); - tmp->prefix = p_dupstr(qptr, length); - tmp->length = length; - - /* replace q_list by tmp */ - if (q_list->next) { - tmp->next = q_list->next; - q_list->next->prev = tmp; - } - if (q_list->prev) { - tmp->prev = q_list->prev; - q_list->prev->next = tmp; + + /* Did I mention how much I like emulating Lisp in C? */ + + /* classify quoting prefix */ + while (q_list) { + if (length <= q_list->length) { + /* case 1: check the top level nodes */ + + 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 = 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 */ + if (q_list->next) { + tmp->next = q_list->next; + q_list->next->prev = tmp; + } + if (q_list->prev) { + tmp->prev = q_list->prev; + q_list->prev->next = tmp; + } + + /* make q_list a child of tmp */ + tmp->down = q_list; + q_list->up = tmp; + + /* q_list has no siblings for now */ + q_list->next = NULL; + q_list->prev = NULL; + + /* update the root if necessary */ + if (q_list == *QuoteList) + *QuoteList = tmp; + + lindex = q_list->index; + + /* tmp should be the return class too */ + class = tmp; + + /* next class to test; if tmp is a shorter prefix for another + * node, that node can only be in the top level list, so don't + * go down after this point + */ + q_list = tmp->next; + } else { + /* found another branch for which tmp is a shorter prefix */ + + /* save the next sibling for later */ + save = q_list->next; + + /* unlink q_list from the top level list */ + if (q_list->next) + q_list->next->prev = q_list->prev; + if (q_list->prev) + q_list->prev->next = q_list->next; + + /* at this point, we have a tmp->down; link q_list to it */ + ptr = tmp->down; + /* sibling order is important here, q_list should be linked last */ + while (ptr->next) + ptr = ptr->next; + ptr->next = q_list; + q_list->next = NULL; + q_list->prev = ptr; + q_list->up = tmp; + + lindex = q_list->index; + + /* next class to test; as above, we shouldn't go down */ + q_list = save; } - /* make q_list a child of tmp */ - tmp->down = q_list; - tmp->up = q_list->up; - q_list->up = tmp; - if (tmp->up->down == q_list) - tmp->up->down = tmp; - - /* q_list has no siblings */ - q_list->next = NULL; - q_list->prev = NULL; - - lindex = q_list->index; - - /* tmp should be the return class too */ - class = tmp; - - /* next class to test */ - q_list = tmp->next; - } - else { - /* found another branch for which tmp is a shorter prefix */ - - /* save the next sibling for later */ - save = q_list->next; - - /* unlink q_list from the top level list */ - if (q_list->next) - q_list->next->prev = q_list->prev; - if (q_list->prev) - q_list->prev->next = q_list->next; - - /* at this point, we have a tmp->down; link q_list to it */ - ptr = tmp->down; - while (ptr->next) - ptr = ptr->next; - ptr->next = q_list; - q_list->next = NULL; - q_list->prev = ptr; - q_list->up = tmp; - - lindex = q_list->index; - - /* next class to test */ - q_list = save; - } - - /* we found a shorter prefix, so we need a redraw */ - *force_redraw = 1; - continue; - } - else { - q_list = q_list->next; - continue; + /* we found a shorter prefix, so certain quotes have changed classes */ + *force_redraw = 1; + continue; + } else { + /* shorter, but not a substring of the current class: try next */ + q_list = q_list->next; + continue; } - } - else { - /* longer than the current prefix: try subclassing it */ - if (tmp == NULL - && m_strncmp(tail_qptr, (q_list->prefix) + offset, - q_list->length - offset) == 0) { - /* still a subclass: go down one level */ - ptr = q_list; - offset = q_list->length; - - q_list = q_list->down; - tail_lng = length - offset; - tail_qptr = (char *) qptr + offset; + } else { + /* case 2: try subclassing the current top level node */ - continue; - } - else { - /* nope, try the next prefix */ - q_list = q_list->next; - continue; - } - } - } + /* tmp != NULL means we already found a shorter prefix at case 1 */ + if (tmp == NULL + && m_strncmp(qptr, q_list->prefix, q_list->length) == 0) { + /* ok, it's a subclass somewhere on this branch */ + + ptr = q_list; + offset = q_list->length; + + q_list = q_list->down; + tail_lng = length - offset; + tail_qptr = (char *) qptr + offset; + + while (q_list) { + if (length <= q_list->length) { + if (m_strncmp(tail_qptr, (q_list->prefix) + offset, tail_lng) + == 0) { + /* same prefix: return the current class */ + if (length == q_list->length) + return q_list; + + /* found shorter common prefix */ + if (tmp == NULL) { + /* add a node above q_list */ + tmp = p_new(struct q_class_t, 1); + tmp->prefix = p_dupstr(qptr, length); + tmp->length = length; + + /* replace q_list by tmp */ + if (q_list->next) { + tmp->next = q_list->next; + q_list->next->prev = tmp; + } + if (q_list->prev) { + tmp->prev = q_list->prev; + q_list->prev->next = tmp; + } + + /* make q_list a child of tmp */ + tmp->down = q_list; + tmp->up = q_list->up; + q_list->up = tmp; + if (tmp->up->down == q_list) + tmp->up->down = tmp; + + /* q_list has no siblings */ + q_list->next = NULL; + q_list->prev = NULL; + + lindex = q_list->index; + + /* tmp should be the return class too */ + class = tmp; + + /* next class to test */ + q_list = tmp->next; + } else { + /* found another branch for which tmp is a shorter prefix */ + + /* save the next sibling for later */ + save = q_list->next; + + /* unlink q_list from the top level list */ + if (q_list->next) + q_list->next->prev = q_list->prev; + if (q_list->prev) + q_list->prev->next = q_list->next; + + /* at this point, we have a tmp->down; link q_list to it */ + ptr = tmp->down; + while (ptr->next) + ptr = ptr->next; + ptr->next = q_list; + q_list->next = NULL; + q_list->prev = ptr; + q_list->up = tmp; + + lindex = q_list->index; + + /* next class to test */ + q_list = save; + } + + /* we found a shorter prefix, so we need a redraw */ + *force_redraw = 1; + continue; + } else { + q_list = q_list->next; + continue; + } + } else { + /* longer than the current prefix: try subclassing it */ + if (tmp == NULL + && m_strncmp(tail_qptr, (q_list->prefix) + offset, + q_list->length - offset) == 0) { + /* still a subclass: go down one level */ + ptr = q_list; + offset = q_list->length; + + q_list = q_list->down; + tail_lng = length - offset; + tail_qptr = (char *) qptr + offset; + + continue; + } else { + /* nope, try the next prefix */ + q_list = q_list->next; + continue; + } + } + } - /* still not found so far: add it as a sibling to the current node */ - if (class == NULL) { - tmp = p_new(struct q_class_t, 1); - tmp->prefix = p_dupstr(qptr, length); - tmp->length = length; + /* still not found so far: add it as a sibling to the current node */ + if (class == NULL) { + tmp = p_new(struct q_class_t, 1); + tmp->prefix = p_dupstr(qptr, length); + tmp->length = length; - if (ptr->down) { - tmp->next = ptr->down; - ptr->down->prev = tmp; - } - ptr->down = tmp; - tmp->up = ptr; + if (ptr->down) { + tmp->next = ptr->down; + ptr->down->prev = tmp; + } + ptr->down = tmp; + tmp->up = ptr; - new_class_color (tmp, q_level); + new_class_color (tmp, q_level); - return tmp; - } - else { - if (lindex != -1) - shift_class_colors (*QuoteList, tmp, lindex, q_level); + return tmp; + } else { + if (lindex != -1) + shift_class_colors (*QuoteList, tmp, lindex, q_level); - return class; + return class; + } + } else { + /* nope, try the next prefix */ + q_list = q_list->next; + continue; + } } - } - else { - /* nope, try the next prefix */ - q_list = q_list->next; - continue; - } } - } - if (class == NULL) { - /* not found so far: add it as a top level class */ - class = p_new(struct q_class_t, 1); - class->prefix = p_dupstr(qptr, length); - class->length = length; - new_class_color (class, q_level); + if (class == NULL) { + /* not found so far: add it as a top level class */ + class = p_new(struct q_class_t, 1); + class->prefix = p_dupstr(qptr, length); + class->length = length; + new_class_color (class, q_level); - if (*QuoteList) { - class->next = *QuoteList; - (*QuoteList)->prev = class; + if (*QuoteList) { + class->next = *QuoteList; + (*QuoteList)->prev = class; + } + *QuoteList = class; } - *QuoteList = class; - } - if (lindex != -1) - shift_class_colors (*QuoteList, tmp, lindex, q_level); + if (lindex != -1) + shift_class_colors (*QuoteList, tmp, lindex, q_level); - return class; + return class; } static int brailleLine = -1; @@ -634,306 +603,292 @@ 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) { - COLOR_LINE *color_line; - regmatch_t pmatch[1], smatch[1]; - int found, offset, null_rx, i; - - if (n == 0 || ISHEADER (lineInfo[n - 1].type)) { - if (buf[0] == '\n') { - lineInfo[n].type = MT_COLOR_NORMAL; - getyx(stdscr, brailleLine, brailleCol); - } - else if (n > 0 && (buf[0] == ' ' || buf[0] == '\t')) { - lineInfo[n].type = lineInfo[n - 1].type; /* wrapped line */ - (lineInfo[n].syntax)[0].color = (lineInfo[n - 1].syntax)[0].color; - } - else { - lineInfo[n].type = MT_COLOR_HDEFAULT; - color_line = ColorHdrList; - while (color_line) { - if (REGEXEC (&color_line->rx, buf) == 0) { - lineInfo[n].type = MT_COLOR_HEADER; - lineInfo[n].syntax[0].color = color_line->pair; - break; + COLOR_LINE *color_line; + regmatch_t pmatch[1], smatch[1]; + int found, offset, null_rx, i; + + if (n == 0 || ISHEADER (lineInfo[n - 1].type)) { + if (buf[0] == '\n') { + lineInfo[n].type = MT_COLOR_NORMAL; + getyx(stdscr, brailleLine, brailleCol); + } + else if (n > 0 && (buf[0] == ' ' || buf[0] == '\t')) { + lineInfo[n].type = lineInfo[n - 1].type; /* wrapped line */ + (lineInfo[n].syntax)[0].color = (lineInfo[n - 1].syntax)[0].color; + } else { + lineInfo[n].type = MT_COLOR_HDEFAULT; + color_line = ColorHdrList; + while (color_line) { + if (REGEXEC (&color_line->rx, buf) == 0) { + lineInfo[n].type = MT_COLOR_HEADER; + lineInfo[n].syntax[0].color = color_line->pair; + break; + } + color_line = color_line->next; + } } - color_line = color_line->next; - } - } - } - else if (m_strncmp("\033[0m", rawbuf, 4) == 0) /* a little hack... */ - lineInfo[n].type = MT_COLOR_NORMAL; -#if 0 - else if (m_strncmp("[-- ", buf, 4) == 0) - lineInfo[n].type = MT_COLOR_ATTACHMENT; -#else - else if (check_attachment_marker ((char *) rawbuf) == 0) - lineInfo[n].type = MT_COLOR_ATTACHMENT; -#endif - else if (m_strcmp("-- \n", buf) == 0 - || m_strcmp("-- \r\n", buf) == 0) { - i = n + 1; - - lineInfo[n].type = MT_COLOR_SIGNATURE; - while (i < last && check_sig (buf, lineInfo, i - 1) == 0 && - (lineInfo[i].type == MT_COLOR_NORMAL || - lineInfo[i].type == MT_COLOR_QUOTED || - lineInfo[i].type == MT_COLOR_HEADER)) { - /* oops... */ - if (lineInfo[i].chunks) { - lineInfo[i].chunks = 0; - p_realloc(&(lineInfo[n].syntax), 1); - } - lineInfo[i++].type = MT_COLOR_SIGNATURE; } - } - else if (check_sig (buf, lineInfo, n - 1) == 0) - lineInfo[n].type = MT_COLOR_SIGNATURE; - else if (regexec ((regex_t *) QuoteRegexp.rx, buf, 1, pmatch, 0) == 0) { - if (regexec ((regex_t *) Smileys.rx, buf, 1, smatch, 0) == 0) { - if (smatch[0].rm_so > 0) { - char c; - - /* hack to avoid making an extra copy of buf */ - c = buf[smatch[0].rm_so]; - buf[smatch[0].rm_so] = 0; - - if (regexec ((regex_t *) QuoteRegexp.rx, buf, 1, pmatch, 0) == 0) { - if (q_classify && lineInfo[n].quote == NULL) - lineInfo[n].quote = classify_quote (QuoteList, - buf + pmatch[0].rm_so, - pmatch[0].rm_eo - - pmatch[0].rm_so, force_redraw, - q_level); - lineInfo[n].type = MT_COLOR_QUOTED; + else if (m_strncmp("\033[0m", rawbuf, 4) == 0) /* a little hack... */ + lineInfo[n].type = MT_COLOR_NORMAL; + else if (check_attachment_marker ((char *) rawbuf) == 0) + lineInfo[n].type = MT_COLOR_ATTACHMENT; + else if (m_strcmp("-- \n", buf) == 0 + || m_strcmp("-- \r\n", buf) == 0) { + i = n + 1; + + lineInfo[n].type = MT_COLOR_SIGNATURE; + while (i < last && check_sig(buf, lineInfo, i - 1) == 0 && + (lineInfo[i].type == MT_COLOR_NORMAL || + lineInfo[i].type == MT_COLOR_QUOTED || + lineInfo[i].type == MT_COLOR_HEADER)) { + /* oops... */ + if (lineInfo[i].chunks) { + lineInfo[i].chunks = 0; + p_realloc(&(lineInfo[n].syntax), 1); + } + lineInfo[i++].type = MT_COLOR_SIGNATURE; } - else - lineInfo[n].type = MT_COLOR_NORMAL; + } + else if (check_sig(buf, lineInfo, n - 1) == 0) + lineInfo[n].type = MT_COLOR_SIGNATURE; + else if (regexec ((regex_t *) QuoteRegexp.rx, buf, 1, pmatch, 0) == 0) { + if (regexec ((regex_t *) Smileys.rx, buf, 1, smatch, 0) == 0) { + if (smatch[0].rm_so > 0) { + char c; + + /* hack to avoid making an extra copy of buf */ + c = buf[smatch[0].rm_so]; + buf[smatch[0].rm_so] = 0; + + if (regexec ((regex_t *) QuoteRegexp.rx, buf, 1, pmatch, 0) == 0) { + if (q_classify && lineInfo[n].quote == NULL) + lineInfo[n].quote = classify_quote (QuoteList, + buf + pmatch[0].rm_so, + pmatch[0].rm_eo - + pmatch[0].rm_so, force_redraw, + q_level); + lineInfo[n].type = MT_COLOR_QUOTED; + } else { + lineInfo[n].type = MT_COLOR_NORMAL; + } - buf[smatch[0].rm_so] = c; - } - else + buf[smatch[0].rm_so] = c; + } else { + lineInfo[n].type = MT_COLOR_NORMAL; + } + } else { + if (q_classify && lineInfo[n].quote == NULL) + lineInfo[n].quote = classify_quote (QuoteList, buf + pmatch[0].rm_so, + pmatch[0].rm_eo - pmatch[0].rm_so, + force_redraw, q_level); + lineInfo[n].type = MT_COLOR_QUOTED; + } + } else { lineInfo[n].type = MT_COLOR_NORMAL; } - else { - if (q_classify && lineInfo[n].quote == NULL) - lineInfo[n].quote = classify_quote (QuoteList, buf + pmatch[0].rm_so, - pmatch[0].rm_eo - pmatch[0].rm_so, - force_redraw, q_level); - lineInfo[n].type = MT_COLOR_QUOTED; - } - } - else - lineInfo[n].type = MT_COLOR_NORMAL; - /* body patterns */ - if (lineInfo[n].type == MT_COLOR_NORMAL || - lineInfo[n].type == MT_COLOR_QUOTED) { - i = 0; + /* body patterns */ + if (lineInfo[n].type == MT_COLOR_NORMAL || + lineInfo[n].type == MT_COLOR_QUOTED) { + i = 0; - offset = 0; - lineInfo[n].chunks = 0; - do { - if (!buf[offset]) - break; + offset = 0; + lineInfo[n].chunks = 0; + do { + if (!buf[offset]) + break; - found = 0; - null_rx = 0; - color_line = ColorBodyList; - while (color_line) { - if (regexec (&color_line->rx, buf + offset, 1, pmatch, - (offset ? REG_NOTBOL : 0)) == 0) { - if (pmatch[0].rm_eo != pmatch[0].rm_so) { - if (!found) { - if (++(lineInfo[n].chunks) > 1) - p_realloc(&(lineInfo[n].syntax), lineInfo[n].chunks); - } - i = lineInfo[n].chunks - 1; - pmatch[0].rm_so += offset; - pmatch[0].rm_eo += offset; - if (!found || - pmatch[0].rm_so < (lineInfo[n].syntax)[i].first || - (pmatch[0].rm_so == (lineInfo[n].syntax)[i].first && - pmatch[0].rm_eo > (lineInfo[n].syntax)[i].last)) { - (lineInfo[n].syntax)[i].color = color_line->pair; - (lineInfo[n].syntax)[i].first = pmatch[0].rm_so; - (lineInfo[n].syntax)[i].last = pmatch[0].rm_eo; - } - found = 1; + found = 0; null_rx = 0; - } - else - null_rx = 1; /* empty regexp; don't add it, but keep looking */ - } - color_line = color_line->next; - } + color_line = ColorBodyList; + while (color_line) { + if (regexec (&color_line->rx, buf + offset, 1, pmatch, + (offset ? REG_NOTBOL : 0)) == 0) { + if (pmatch[0].rm_eo != pmatch[0].rm_so) { + if (!found) { + if (++(lineInfo[n].chunks) > 1) + p_realloc(&(lineInfo[n].syntax), lineInfo[n].chunks); + } + i = lineInfo[n].chunks - 1; + pmatch[0].rm_so += offset; + pmatch[0].rm_eo += offset; + if (!found || + pmatch[0].rm_so < (lineInfo[n].syntax)[i].first || + (pmatch[0].rm_so == (lineInfo[n].syntax)[i].first && + pmatch[0].rm_eo > (lineInfo[n].syntax)[i].last)) { + (lineInfo[n].syntax)[i].color = color_line->pair; + (lineInfo[n].syntax)[i].first = pmatch[0].rm_so; + (lineInfo[n].syntax)[i].last = pmatch[0].rm_eo; + } + found = 1; + null_rx = 0; + } else { + null_rx = 1; /* empty regexp; don't add it, but keep looking */ + } + } + color_line = color_line->next; + } - if (null_rx) - offset++; /* avoid degenerate cases */ - else - offset = (lineInfo[n].syntax)[i].last; - } while (found || null_rx); - } + if (null_rx) + offset++; /* avoid degenerate cases */ + else + offset = lineInfo[n].syntax[i].last; + } while (found || null_rx); + } } -static int is_ansi (unsigned char *buf) +static int is_ansi(unsigned char *buf) { - while (*buf && (isdigit (*buf) || *buf == ';')) - buf++; - return (*buf == 'm'); + while (isdigit(*buf) || *buf == ';') + buf++; + return (*buf == 'm'); } -static int check_attachment_marker (char *p) +static int check_attachment_marker(char *p) { - char *q = AttachmentMarker; + char *q = AttachmentMarker; - for (; *p == *q && *q && *p && *q != '\a' && *p != '\a'; p++, q++); - return (int) (*p - *q); + for (; *p == *q && *q && *p && *q != '\a' && *p != '\a'; p++, q++); + return (int)(*p - *q); } static int grok_ansi (unsigned char *buf, int pos, ansi_attr * a) { - int x = pos; - - while (isdigit (buf[x]) || buf[x] == ';') - x++; - - /* Character Attributes */ - if (option (OPTALLOWANSI) && a != NULL && buf[x] == 'm') { - if (pos == x) { -#ifdef HAVE_COLOR - if (a->pair != -1) - mutt_free_color (a->fg, a->bg); -#endif - a->attr = ANSI_OFF; - a->pair = -1; - } - a->bg = -2; - a->fg = -2; - while (pos < x) { - if (buf[pos] == '1' && (pos + 1 == x || buf[pos + 1] == ';')) { - a->attr |= ANSI_BOLD; - pos += 2; - } - else if (buf[pos] == '4' && (pos + 1 == x || buf[pos + 1] == ';')) { - a->attr |= ANSI_UNDERLINE; - pos += 2; - } - else if (buf[pos] == '5' && (pos + 1 == x || buf[pos + 1] == ';')) { - a->attr |= ANSI_BLINK; - pos += 2; - } - else if (buf[pos] == '7' && (pos + 1 == x || buf[pos + 1] == ';')) { - a->attr |= ANSI_REVERSE; - pos += 2; - } - else if (buf[pos] == '0' && (pos + 1 == x || buf[pos + 1] == ';')) { + int x = pos; + + while (isdigit (buf[x]) || buf[x] == ';') + x++; + + /* Character Attributes */ + if (option (OPTALLOWANSI) && a != NULL && buf[x] == 'm') { + if (pos == x) { + if (a->pair != -1) + mutt_free_color (a->fg, a->bg); + a->attr = ANSI_OFF; + a->pair = -1; + } a->bg = -2; a->fg = -2; - pos += 2; - } - else if (buf[pos] == '3' && isdigit (buf[pos + 1])) { -#ifdef HAVE_COLOR - if (a->pair != -1) - mutt_free_color (a->fg, a->bg); -#endif - a->pair = -1; - a->attr |= ANSI_COLOR; - if (buf[pos + 1] != '9') - a->fg = buf[pos + 1] - '0'; - pos += 3; - } - else if (buf[pos] == '4' && isdigit (buf[pos + 1])) { -#ifdef HAVE_COLOR - if (a->pair != -1) - mutt_free_color (a->fg, a->bg); -#endif - a->pair = -1; - a->attr |= ANSI_COLOR; - if (buf[pos + 1] != '9') - a->bg = buf[pos + 1] - '0'; - pos += 3; - } - else { - while (pos < x && buf[pos] != ';') - pos++; - pos++; - } + while (pos < x) { + if (buf[pos] == '1' && (pos + 1 == x || buf[pos + 1] == ';')) { + a->attr |= ANSI_BOLD; + pos += 2; + } + else if (buf[pos] == '4' && (pos + 1 == x || buf[pos + 1] == ';')) { + a->attr |= ANSI_UNDERLINE; + pos += 2; + } + else if (buf[pos] == '5' && (pos + 1 == x || buf[pos + 1] == ';')) { + a->attr |= ANSI_BLINK; + pos += 2; + } + else if (buf[pos] == '7' && (pos + 1 == x || buf[pos + 1] == ';')) { + a->attr |= ANSI_REVERSE; + pos += 2; + } + else if (buf[pos] == '0' && (pos + 1 == x || buf[pos + 1] == ';')) { + a->bg = -2; + a->fg = -2; + pos += 2; + } + else if (buf[pos] == '3' && isdigit (buf[pos + 1])) { + if (a->pair != -1) + mutt_free_color (a->fg, a->bg); + a->pair = -1; + a->attr |= ANSI_COLOR; + if (buf[pos + 1] != '9') + a->fg = buf[pos + 1] - '0'; + pos += 3; + } + else if (buf[pos] == '4' && isdigit (buf[pos + 1])) { + if (a->pair != -1) + mutt_free_color (a->fg, a->bg); + a->pair = -1; + a->attr |= ANSI_COLOR; + if (buf[pos + 1] != '9') + a->bg = buf[pos + 1] - '0'; + pos += 3; + } else { + while (pos < x && buf[pos] != ';') + pos++; + pos++; + } + } } - } - pos = x; - return pos; + pos = x; + return pos; } /* 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; - ssize_t k; + mbstate_t mbstate; + ssize_t k; - p_clear(&mbstate, 1); - for (; len > 0; buf += k, len -= k) { - k = mbrtowc (NULL, (char *) buf, len, &mbstate); - if (k == -2) - break; - else if (k == -1 || k == 0) - k = 1; - } - *buf = '\0'; + p_clear(&mbstate, 1); + for (; len > 0; buf += k, len -= k) { + k = mbrtowc (NULL, (char *) buf, len, &mbstate); + if (k == -2) + break; + if (k == -1 || k == 0) + k = 1; + } + *buf = '\0'; - return len; + return len; } static int fill_buffer (FILE * f, off_t *last_pos, off_t offset, unsigned char *buf, unsigned char *fmt, ssize_t blen, int *buf_ready) { - unsigned char *p; - static int b_read = 0; - - if (*buf_ready == 0) { - buf[blen - 1] = 0; - if (offset != *last_pos) - fseeko (f, offset, 0); - if (fgets ((char *) buf, blen - 1, f) == NULL) { - fmt[0] = 0; - return (-1); - } - *last_pos = ftello (f); - b_read = (int) (*last_pos - offset); - *buf_ready = 1; - - /* incomplete mbyte characters trigger a segfault in regex processing for - * certain versions of glibc. Trim them if necessary. */ - if (b_read == blen - 2) - b_read -= trim_incomplete_mbyte(buf, b_read); - - /* copy "buf" to "fmt", but without bold and underline controls */ - p = buf; - while (*p) { - if (*p == '\010' && (p > buf)) { - if (*(p + 1) == '_') /* underline */ - p += 2; - else if (*(p + 1)) { /* bold or overstrike */ - *(fmt - 1) = *(p + 1); - p += 2; + unsigned char *p; + static int b_read = 0; + + if (*buf_ready == 0) { + buf[blen - 1] = 0; + if (offset != *last_pos) + fseeko (f, offset, 0); + if (fgets ((char *) buf, blen - 1, f) == NULL) { + fmt[0] = 0; + return (-1); } - else /* ^H */ - *fmt++ = *p++; - } - else if (*p == '\033' && *(p + 1) == '[' && is_ansi (p + 2)) { - while (*p++ != 'm') /* skip ANSI sequence */ - ; - } - else if (*p == '\033' && *(p + 1) == ']' - && check_attachment_marker ((char *) p) == 0) { - while (*p++ != '\a') /* skip pseudo-ANSI sequence */ - ; - } - else - *fmt++ = *p++; + *last_pos = ftello (f); + b_read = (int) (*last_pos - offset); + *buf_ready = 1; + + /* incomplete mbyte characters trigger a segfault in regex processing for + * certain versions of glibc. Trim them if necessary. */ + if (b_read == blen - 2) + b_read -= trim_incomplete_mbyte(buf, b_read); + + /* copy "buf" to "fmt", but without bold and underline controls */ + p = buf; + while (*p) { + if (*p == '\010' && (p > buf)) { + if (*(p + 1) == '_') /* underline */ + p += 2; + else if (*(p + 1)) { /* bold or overstrike */ + *(fmt - 1) = *(p + 1); + p += 2; + } else { /* ^H */ + *fmt++ = *p++; + } + } + else if (*p == '\033' && *(p + 1) == '[' && is_ansi (p + 2)) { + while (*p++ != 'm') /* skip ANSI sequence */ + ; + } + else if (*p == '\033' && *(p + 1) == ']' + && check_attachment_marker ((char *) p) == 0) { + while (*p++ != '\a') /* skip pseudo-ANSI sequence */ + ; + } else { + *fmt++ = *p++; + } + } + *fmt = 0; } - *fmt = 0; - } - return b_read; + return b_read; } #ifdef USE_NNTP @@ -1013,8 +968,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, else if (wc == '_' || wc1 == '_') { special |= A_UNDERLINE; wc = (wc1 == '_') ? wc : wc1; - } - else { + } else { /* special = 0; / * overstrike: nothing to do! */ wc = wc1; } @@ -1067,8 +1021,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, col += 4; if (pa) printw ("\\%03o", wc); - } - else { + } else { if (col + 1 > wrap_cols) break; ++col; @@ -1099,7 +1052,6 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, * 0 normal exit, line was not displayed * >0 normal exit, line was displayed */ - static int display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n, int *last, int *max, int flags, struct q_class_t **QuoteList, @@ -1235,9 +1187,8 @@ display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n, } /* now chose a good place to break the line */ - cnt = - format_line (lineInfo, n, buf, flags, 0, b_read, &ch, &vch, &col, - &special); + cnt = format_line(lineInfo, n, buf, flags, 0, b_read, &ch, &vch, &col, + &special); buf_ptr = buf + cnt; /* move the break point only if smart_wrap is set */ @@ -1254,9 +1205,9 @@ display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n, buf_ptr = buf + cnt; else cnt = ch + 1; - } - else + } else { buf_ptr = buf + cnt; /* a very long word... */ + } } if (!(flags & M_PAGER_NSKIP)) /* skip leading blanks on the next line too */ @@ -1372,7 +1323,6 @@ static struct mapping_t PagerNewsHelpExtra[] = { #endif - /* This pager is actually not so simple as it once was. It now operates in two modes: one for viewing messages and the other for viewing help. These can be distinguished by whether or not ``hdr'' is NULL. The ``hdr'' arg @@ -1383,8 +1333,8 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) { static char searchbuf[STRING]; char buffer[LONG_STRING]; - char helpstr[SHORT_STRING * 2]; - char tmphelp[SHORT_STRING * 2]; + char helpstr[STRING * 2]; + char tmphelp[STRING * 2]; int maxLine, lastLine = 0; struct line_t *lineInfo; struct q_class_t *QuoteList = NULL; @@ -1426,7 +1376,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) if (stat (fname, &sb) != 0) { mutt_perror (fname); - fclose (fp); + m_fclose(&fp); return (-1); } unlink (fname); @@ -1447,10 +1397,10 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) (lineInfo[i].syntax)[0].first = (lineInfo[i].syntax)[0].last = -1; } - mutt_compile_help (helpstr, sizeof (helpstr), MENU_PAGER, PagerHelp); + mutt_compile_help (helpstr, sizeof(helpstr), MENU_PAGER, PagerHelp); if (IsHeader (extra)) { m_strcpy(tmphelp, sizeof(tmphelp), helpstr); - mutt_compile_help (buffer, sizeof (buffer), MENU_PAGER, + mutt_compile_help (buffer, sizeof(buffer), MENU_PAGER, #ifdef USE_NNTP (Context && (Context->magic == M_NNTP)) ? PagerNewsHelpExtra : @@ -1460,8 +1410,8 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) } if (!InHelp) { 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); + mutt_make_help (buffer, sizeof(buffer), _("Help"), MENU_PAGER, OP_HELP); + snprintf (helpstr, sizeof(helpstr), "%s %s", tmphelp, buffer); } while (ch != -1) { @@ -1489,8 +1439,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) bodylen = helpoffset - bodyoffset; if (!option (OPTHELP)) bodylen++; - } - else { + } else { helpoffset = 0; indexoffset = 1; statusoffset = LINES - 2; @@ -1677,9 +1626,9 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) else topline = TopLine; continue; - } - else + } else { OldHdr = NULL; + } ch = km_dokey (MENU_PAGER); if (ch != -1) @@ -1709,8 +1658,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) ch = -1; rc = OP_REFORMAT_WINCH; - } - else { + } else { for (i = 0; i < maxLine; i++) { lineInfo[i].offset = 0; lineInfo[i].type = -1; @@ -1720,8 +1668,8 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) lineInfo[i].quote = NULL; p_realloc(&lineInfo[i].syntax, 1); - if (SearchCompiled && lineInfo[i].search) - p_delete(&(lineInfo[i].search)); + if (SearchCompiled) + p_delete(&lineInfo[i].search); } lastLine = 0; @@ -1756,8 +1704,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) else if (option (OPTPAGERSTOP)) { /* emulate "less -q" and don't go on to the next message. */ mutt_error _("Bottom of message is shown."); - } - else { + } else { /* end of the current message, so display the next message. */ rc = OP_MAIN_NEXT_UNDELETED; ch = -1; @@ -1814,8 +1761,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) else if (option (OPTPAGERSTOP)) { /* emulate "less -q" and don't go on to the next message. */ mutt_error _("Bottom of message is shown."); - } - else { + } else { /* end of the current message, so display the next message. */ rc = OP_MAIN_NEXT_UNDELETED; ch = -1; @@ -1870,7 +1816,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) M_CLEAR) != 0) break; - if (!strcmp (buffer, searchbuf)) { + if (!m_strcmp (buffer, searchbuf)) { if (SearchCompiled) { /* do an implicit search-next */ if (ch == OP_SEARCH) @@ -1896,8 +1842,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) if (SearchCompiled) { regfree (&SearchRE); for (i = 0; i < lastLine; i++) { - if (lineInfo[i].search) - p_delete(&(lineInfo[i].search)); + p_delete(&lineInfo[i].search); lineInfo[i].search_cnt = -1; } } @@ -1910,8 +1855,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) regfree (&SearchRE); for (i = 0; i < maxLine; i++) { /* cleanup */ - if (lineInfo[i].search) - p_delete(&(lineInfo[i].search)); + p_delete(&lineInfo[i].search); lineInfo[i].search_cnt = -1; } SearchFlag = 0; @@ -2200,8 +2144,8 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) lineInfo[i].quote = NULL; p_realloc(&(lineInfo[i].syntax), 1); - if (SearchCompiled && lineInfo[i].search) - p_delete(&(lineInfo[i].search)); + if (SearchCompiled) + p_delete(&lineInfo[i].search); } if (SearchCompiled) { @@ -2526,19 +2470,6 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) redraw = REDRAW_FULL; break; - - case OP_MAIL_KEY: - CHECK_MODE (IsHeader (extra)); - CHECK_ATTACH; - ci_send_message (SENDKEY, NULL, NULL, extra->ctx, extra->hdr); - redraw = REDRAW_FULL; - break; - - - case OP_FORGET_PASSPHRASE: - crypt_forget_passphrase (); - break; - case OP_EXTRACT_KEYS: CHECK_MODE (IsHeader (extra)); crypt_extract_keys_from_messages (extra->hdr); @@ -2559,7 +2490,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) } } - fclose (fp); + m_fclose(&fp); if (IsHeader (extra)) { Context->msgnotreadyet = -1; if (rc == -1) @@ -2570,12 +2501,12 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) } } - cleanup_quote (&QuoteList); + cleanup_quote(&QuoteList); for (i = 0; i < maxLine; i++) { - p_delete(&(lineInfo[i].syntax)); - if (SearchCompiled && lineInfo[i].search) - p_delete(&(lineInfo[i].search)); + p_delete(&lineInfo[i].syntax); + if (SearchCompiled) + p_delete(&lineInfo[i].search); } if (SearchCompiled) { regfree (&SearchRE); @@ -2586,3 +2517,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) mutt_menuDestroy (&pager_index); return (rc != -1 ? rc : 0); } + +#undef CHECK_ATTACH +#undef CHECK_READONLY +#undef CHECK_MODE