# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "enter.h"
#include "mutt_curses.h"
#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 <wchar.h>
#include <sys/stat.h>
#include <ctype.h>
#include <unistd.h>
};
struct line_t {
- LOFF_T offset;
+ off_t offset;
short type;
short continuation;
short chunks;
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;
}
/* 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;
}
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 */
/* 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;
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)
/* 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 */
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;
/* 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) {
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);
}
}
}
- 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;
/* 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;
}
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;
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])) {
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)
}
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;
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 */
*/
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)
{
}
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;
}
(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 =
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;
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;
}
if (option (OPTHELP)) {
SETCOLOR (MT_COLOR_STATUS);
- move (helpoffset, 0);
- mutt_paddstr (COLS, helpstr);
+ move (helpoffset, SW);
+ mutt_paddstr (COLS-SW, helpstr);
SETCOLOR (MT_COLOR_NORMAL);
}
lines = Resize->line;
redraw |= REDRAW_SIGWINCH;
- mem_free (&Resize);
+ p_delete(&Resize);
}
#endif
_mutt_make_string (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt),
Context, extra->bdy->hdr, M_FORMAT_MAKEPRINT);
}
- if (option(OPTSTATUSONTOP)) {
- move(0,0);
- } else {
- move(LINES-2,SW);
- }
- mutt_paddstr (COLS - 10 - (option(OPTSTATUSONTOP)?0:SW), IsHeader (extra)
- || IsMsgAttach (extra) ? buffer : banner);
+ move(statusoffset,SW);
+ mutt_paddstr (COLS - 10 - SW, IsHeader (extra) ||
+ IsMsgAttach (extra) ? buffer : banner);
addstr (" -- (");
if (last_pos < sb.st_size - 1)
sidebar_draw (MENU_PAGER);
/* print out the index status bar */
menu_status_line (buffer, sizeof (buffer), index, NONULL (Status));
- move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),
- option (OPTSTATUSONTOP) ? 0 : SW);
+ move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), SW);
SETCOLOR (MT_COLOR_STATUS);
BKGDSET (MT_COLOR_STATUS);
- mutt_paddstr (COLS - (option (OPTSTATUSONTOP) ? 0 : SW),
- buffer);
+ mutt_paddstr (COLS-SW, buffer);
SETCOLOR (MT_COLOR_NORMAL);
BKGDSET (MT_COLOR_NORMAL);
}
lines++;
if (flags & M_PAGER_RETWINCH) {
- Resize = mem_malloc (sizeof (struct resize));
+ Resize = p_new(struct resize, 1);
Resize->line = lines;
Resize->SearchCompiled = SearchCompiled;
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;
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;
}
}
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;
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) {
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
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);