X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pager.c;h=965a85e9bed80d607baed7e5022b7048eff5573d;hp=9cc94a11b161117e38b2c69f3503dc3d4853b0f8;hb=2a06362a155582cd59ae2ef6f0df71694a7eede3;hpb=1f2995420ee1612199ab8af9909159a2a8afbdab diff --git a/pager.c b/pager.c index 9cc94a1..965a85e 100644 --- a/pager.c +++ b/pager.c @@ -15,12 +15,16 @@ # include "config.h" #endif +#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" @@ -37,12 +41,10 @@ #include "mutt_crypt.h" -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" #include "lib/rx.h" #include "lib/debug.h" +#include #include #include #include @@ -106,7 +108,7 @@ struct syntax_t { }; struct line_t { - LOFF_T offset; + off_t offset; short type; short continuation; short chunks; @@ -352,8 +354,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; } @@ -374,7 +376,7 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList, /* 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; } @@ -388,17 +390,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 */ @@ -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) @@ -498,11 +498,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 */ @@ -573,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; @@ -595,10 +592,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) { @@ -629,9 +624,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); @@ -684,17 +678,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", 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) 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; @@ -705,7 +699,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; } @@ -769,9 +763,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; @@ -853,12 +845,8 @@ static int grok_ansi (unsigned char *buf, int pos, ansi_attr * a) pos += 2; } else if (buf[pos] == '0' && (pos + 1 == x || buf[pos + 1] == ';')) { -#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; pos += 2; } else if (buf[pos] == '3' && isdigit (buf[pos + 1])) { @@ -899,7 +887,7 @@ static int trim_incomplete_mbyte(unsigned char *buf, size_t len) { mbstate_t mbstate; size_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 +901,7 @@ static int trim_incomplete_mbyte(unsigned char *buf, size_t len) { } static int -fill_buffer (FILE * f, LOFF_T *last_pos, LOFF_T offset, unsigned char *buf, +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 *p; @@ -993,7 +981,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 */ @@ -1135,7 +1123,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, */ static int -display_line (FILE * f, LOFF_T *last_pos, struct line_t **lineInfo, int n, +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, int *q_level, int *force_redraw, regex_t * SearchRE) { @@ -1156,12 +1144,12 @@ display_line (FILE * f, LOFF_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; } @@ -1233,10 +1221,9 @@ display_line (FILE * f, LOFF_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 = @@ -1428,7 +1415,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) int r = -1; int redraw = REDRAW_FULL; FILE *fp = NULL; - LOFF_T last_pos = 0, last_offset = 0; + off_t last_pos = 0, last_offset = 0; int old_smart_wrap, old_markers; struct stat sb; regex_t SearchRE; @@ -1473,18 +1460,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 @@ -1494,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); } @@ -1556,7 +1543,7 @@ 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 @@ -1739,7 +1726,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; @@ -1757,9 +1744,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; @@ -1902,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) @@ -1923,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) @@ -1935,7 +1922,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; } } @@ -1949,7 +1936,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; @@ -2239,9 +2226,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) { @@ -2355,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 @@ -2630,15 +2617,15 @@ 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); + p_delete(&lineInfo); if (index) mutt_menuDestroy (&index); return (rc != -1 ? rc : 0);