#include "mutt.h"
#include "mutt_curses.h"
-#include "mutt_regex.h"
#include "keymap.h"
#include "mutt_menu.h"
#include "mapping.h"
#include "attach.h"
#include "mbyte.h"
#include "sidebar.h"
+#include "buffy.h"
#include "mx.h"
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
+#include "lib/rx.h"
+#include "lib/debug.h"
#include <sys/stat.h>
#include <ctype.h>
break; \
}
-#ifdef USE_IMAP
-/* the error message returned here could be better. */
-#define CHECK_IMAP_ACL(aclbit) if (Context->magic == M_IMAP) \
- if (mutt_bit_isset (((IMAP_DATA *)Context->data)->capabilities, ACL) \
- && !mutt_bit_isset(((IMAP_DATA *)Context->data)->rights,aclbit)){ \
- mutt_flushinp(); \
- mutt_error ("Operation not permitted by the IMAP ACL for this mailbox"); \
- break; \
- }
-#endif
-
struct q_class_t {
int length;
int index;
cleanup_quote (&((*QuoteList)->down));
ptr = (*QuoteList)->next;
if ((*QuoteList)->prefix)
- FREE (&(*QuoteList)->prefix);
- FREE (QuoteList);
+ mem_free (&(*QuoteList)->prefix);
+ mem_free (QuoteList);
*QuoteList = ptr;
}
/* not much point in classifying quotes... */
if (*QuoteList == NULL) {
- class = (struct q_class_t *) safe_calloc (1, sizeof (struct q_class_t));
+ class = (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t));
class->color = ColorQuote[0];
*QuoteList = class;
}
if (length <= q_list->length) {
/* case 1: check the top level nodes */
- if (mutt_strncmp (qptr, q_list->prefix, length) == 0) {
+ if (str_ncmp (qptr, q_list->prefix, length) == 0) {
if (length == q_list->length)
return q_list; /* same prefix: return the current class */
if (tmp == NULL) {
/* add a node above q_list */
tmp =
- (struct q_class_t *) safe_calloc (1, sizeof (struct q_class_t));
- tmp->prefix = (char *) safe_calloc (1, length + 1);
+ (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->length = length;
/* tmp != NULL means we already found a shorter prefix at case 1 */
if (tmp == NULL
- && mutt_strncmp (qptr, q_list->prefix, q_list->length) == 0) {
+ && str_ncmp (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 (mutt_strncmp (tail_qptr, (q_list->prefix) + offset, tail_lng)
+ if (str_ncmp (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 *) safe_calloc (1,
+ tmp = (struct q_class_t *) mem_calloc (1,
sizeof (struct
q_class_t));
- tmp->prefix = (char *) safe_calloc (1, length + 1);
+ tmp->prefix = (char *) mem_calloc (1, length + 1);
strncpy (tmp->prefix, qptr, length);
tmp->length = length;
else {
/* longer than the current prefix: try subclassing it */
if (tmp == NULL
- && mutt_strncmp (tail_qptr, (q_list->prefix) + offset,
+ && str_ncmp (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 *) safe_calloc (1, sizeof (struct q_class_t));
- tmp->prefix = (char *) safe_calloc (1, length + 1);
+ (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->length = length;
if (class == NULL) {
/* not found so far: add it as a top level class */
- class = (struct q_class_t *) safe_calloc (1, sizeof (struct q_class_t));
- class->prefix = (char *) safe_calloc (1, length + 1);
+ 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->length = length;
new_class_color (class, q_level);
lineInfo[n].type = MT_COLOR_HDEFAULT;
color_line = ColorHdrList;
while (color_line) {
- if (REGEXEC (color_line->rx, buf) == 0) {
+ if (REGEXEC (&color_line->rx, buf) == 0) {
lineInfo[n].type = MT_COLOR_HEADER;
lineInfo[n].syntax[0].color = color_line->pair;
break;
}
}
}
- else if (mutt_strncmp ("\033[0m", raw, 4) == 0) /* a little hack... */
+ else if (str_ncmp ("\033[0m", raw, 4) == 0) /* a little hack... */
lineInfo[n].type = MT_COLOR_NORMAL;
#if 0
- else if (mutt_strncmp ("[-- ", buf, 4) == 0)
+ else if (str_ncmp ("[-- ", 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 (mutt_strcmp ("-- \n", buf) == 0
- || mutt_strcmp ("-- \r\n", buf) == 0) {
+ else if (str_cmp ("-- \n", buf) == 0
+ || str_cmp ("-- \r\n", buf) == 0) {
i = n + 1;
lineInfo[n].type = MT_COLOR_SIGNATURE;
/* oops... */
if (lineInfo[i].chunks) {
lineInfo[i].chunks = 0;
- safe_realloc (&(lineInfo[n].syntax), sizeof (struct syntax_t));
+ mem_realloc (&(lineInfo[n].syntax), sizeof (struct syntax_t));
}
lineInfo[i++].type = MT_COLOR_SIGNATURE;
}
if (pmatch[0].rm_eo != pmatch[0].rm_so) {
if (!found) {
if (++(lineInfo[n].chunks) > 1)
- safe_realloc (&(lineInfo[n].syntax),
+ mem_realloc (&(lineInfo[n].syntax),
(lineInfo[n].chunks) *
sizeof (struct syntax_t));
}
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;
+ size_t k;
+
+ memset (&mbstate, 0, sizeof (mbstate));
+ 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';
+
+ return len;
+}
+
static int
fill_buffer (FILE * f, long *last_pos, long offset, unsigned char *buf,
unsigned char *fmt, size_t blen, int *buf_ready)
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) {
}
else if (*p == '\033' && *(p + 1) == ']'
&& check_attachment_marker ((char *) p) == 0) {
- dprint (2, (debugfile, "fill_buffer: Seen attachment marker.\n"));
+ debug_print (2, ("seen attachment marker.\n"));
while (*p++ != '\a') /* skip pseudo-ANSI sequence */
;
}
k = mbrtowc (&wc, (char *) buf + ch, cnt - ch, &mbstate);
if (k == -2 || k == -1) {
- dprint (1, (debugfile, "%s:%d: mbrtowc returned %d; errno = %d.\n",
- __FILE__, __LINE__, k, errno));
+ debug_print (1, ("mbrtowc returned %d; errno = %d.\n", k, errno));
if (col + 4 > wrap_cols)
break;
col += 4;
}
if (*last == *max) {
- safe_realloc (lineInfo, sizeof (struct line_t) * (*max += LINES));
+ mem_realloc (lineInfo, sizeof (struct line_t) * (*max += LINES));
for (ch = *last; ch < *max; ch++) {
memset (&((*lineInfo)[ch]), 0, sizeof (struct line_t));
(*lineInfo)[ch].type = -1;
(*lineInfo)[ch].search_cnt = -1;
- (*lineInfo)[ch].syntax = safe_malloc (sizeof (struct syntax_t));
+ (*lineInfo)[ch].syntax = mem_malloc (sizeof (struct syntax_t));
((*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)
- safe_realloc (&((*lineInfo)[n].search),
+ mem_realloc (&((*lineInfo)[n].search),
((*lineInfo)[n].search_cnt) * sizeof (struct syntax_t));
else
- (*lineInfo)[n].search = safe_malloc (sizeof (struct syntax_t));
+ (*lineInfo)[n].search = mem_malloc (sizeof (struct syntax_t));
pmatch[0].rm_so += offset;
pmatch[0].rm_eo += offset;
((*lineInfo)[n].search)[(*lineInfo)[n].search_cnt - 1].first =
/* skip trailing blanks */
while (ch && (buf[ch] == ' ' || buf[ch] == '\t' || buf[ch] == '\r'))
ch--;
- cnt = ch + 1;
+ /* a very long word with leading spaces causes infinite wrapping */
+ if ((!ch) && (flags & M_PAGER_NSKIP))
+ buf_ptr = buf + cnt;
+ else
+ cnt = ch + 1;
}
else
buf_ptr = buf + cnt; /* a very long word... */
mutt_set_flag (Context, extra->hdr, M_READ, 1);
}
- lineInfo = safe_malloc (sizeof (struct line_t) * (maxLine = LINES));
+ lineInfo = mem_malloc (sizeof (struct line_t) * (maxLine = LINES));
for (i = 0; i < maxLine; i++) {
memset (&lineInfo[i], 0, sizeof (struct line_t));
lineInfo[i].type = -1;
lineInfo[i].search_cnt = -1;
- lineInfo[i].syntax = safe_malloc (sizeof (struct syntax_t));
+ lineInfo[i].syntax = mem_malloc (sizeof (struct syntax_t));
(lineInfo[i].syntax)[0].first = (lineInfo[i].syntax)[0].last = -1;
}
lines = Resize->line;
redraw |= REDRAW_SIGWINCH;
- FREE (&Resize);
+ mem_free (&Resize);
}
#endif
_mutt_make_string (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt),
Context, extra->bdy->hdr, M_FORMAT_MAKEPRINT);
}
- move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),
- option (OPTSTATUSONTOP) ? 0 : SidebarWidth);
- mutt_paddstr (COLS - 10, IsHeader (extra)
+ if (option(OPTSTATUSONTOP)) {
+ move(0,0);
+ }
+ /*move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (InHelp?(LINES-2):(indexlen - 1))),
+ option (OPTSTATUSONTOP) ? 0 : SidebarWidth);*/
+ mutt_paddstr (COLS - 10 - (option(OPTSTATUSONTOP)?0:SidebarWidth), IsHeader (extra)
|| IsMsgAttach (extra) ? buffer : banner);
addstr (" -- (");
}
if (redraw & REDRAW_SIDEBAR)
- draw_sidebar (MENU_PAGER);
+ sidebar_draw (MENU_PAGER);
if ((redraw & REDRAW_INDEX) && index) {
/* redraw the pager_index indicator, because the
* flags for this message might have changed. */
menu_redraw_current (index);
- draw_sidebar (MENU_PAGER);
+ 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 : SidebarWidth);
SETCOLOR (MT_COLOR_STATUS);
+ BKGDSET (MT_COLOR_STATUS);
mutt_paddstr (COLS - (option (OPTSTATUSONTOP) ? 0 : SidebarWidth),
buffer);
SETCOLOR (MT_COLOR_NORMAL);
+ BKGDSET (MT_COLOR_NORMAL);
}
/* if we're not using the index, update every time */
if (index == 0)
- draw_sidebar (MENU_PAGER);
+ sidebar_draw (MENU_PAGER);
redraw = 0;
lines++;
if (flags & M_PAGER_RETWINCH) {
- Resize = safe_malloc (sizeof (struct resize));
+ Resize = mem_malloc (sizeof (struct resize));
Resize->line = lines;
Resize->SearchCompiled = SearchCompiled;
lineInfo[i].search_cnt = -1;
lineInfo[i].quote = NULL;
- safe_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
+ mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
if (SearchCompiled && lineInfo[i].search)
- FREE (&(lineInfo[i].search));
+ mem_free (&(lineInfo[i].search));
}
lastLine = 0;
regfree (&SearchRE);
for (i = 0; i < lastLine; i++) {
if (lineInfo[i].search)
- FREE (&(lineInfo[i].search));
+ mem_free (&(lineInfo[i].search));
lineInfo[i].search_cnt = -1;
}
}
for (i = 0; i < maxLine; i++) {
/* cleanup */
if (lineInfo[i].search)
- FREE (&(lineInfo[i].search));
+ mem_free (&(lineInfo[i].search));
lineInfo[i].search_cnt = -1;
}
SearchFlag = 0;
CHECK_MODE (IsHeader (extra));
CHECK_READONLY;
-#ifdef USE_IMAP
- CHECK_IMAP_ACL (IMAP_ACL_DELETE);
-#endif
+ CHECK_MX_ACL (Context, ACL_DELETE, _("Deletion"));
mutt_set_flag (Context, extra->hdr, M_DELETE, 1);
mutt_set_flag (Context, extra->hdr, M_PURGED,
CHECK_MODE (IsHeader (extra));
CHECK_READONLY;
-#ifdef USE_IMAP
- CHECK_IMAP_ACL (IMAP_ACL_DELETE);
-#endif
+ CHECK_MX_ACL (Context, ACL_DELETE, _("Deletion"));
r = mutt_thread_set_flag (extra->hdr, M_DELETE, 1,
ch == OP_DELETE_THREAD ? 0 : 1);
lineInfo[i].search_cnt = -1;
lineInfo[i].quote = NULL;
- safe_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
+ mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
if (SearchCompiled && lineInfo[i].search)
- FREE (&(lineInfo[i].search));
+ mem_free (&(lineInfo[i].search));
}
if (SearchCompiled) {
CHECK_MODE (IsHeader (extra));
CHECK_READONLY;
-#ifdef USE_POP
- if (Context->magic == M_POP) {
- mutt_flushinp ();
- mutt_error _("Can't change 'important' flag on POP server.");
-
- break;
- }
-#endif
-
-#ifdef USE_IMAP
- CHECK_IMAP_ACL (IMAP_ACL_WRITE);
-#endif
-
-#ifdef USE_NNTP
- if (Context->magic == M_NNTP) {
- mutt_flushinp ();
- mutt_error _("Can't change 'important' flag on NNTP server.");
-
- break;
- }
-#endif
+ CHECK_MX_ACL (Context, ACL_WRITE, _("Flagging"));
mutt_set_flag (Context, extra->hdr, M_FLAG, !extra->hdr->flagged);
redraw = REDRAW_STATUS | REDRAW_INDEX;
else
followup_to = extra->hdr->env->followup_to;
- if (!followup_to || mutt_strcasecmp (followup_to, "poster") ||
+ if (!followup_to || str_casecmp (followup_to, "poster") ||
query_quadoption (OPT_FOLLOWUPTOPOSTER,
_("Reply by mail as poster prefers?")) != M_YES) {
if (extra->ctx && extra->ctx->magic == M_NNTP
CHECK_MODE (IsHeader (extra));
CHECK_READONLY;
-#ifdef USE_IMAP
- CHECK_IMAP_ACL (IMAP_ACL_SEEN);
-#endif
+ CHECK_MX_ACL (Context, ACL_SEEN, _("Toggling"));
if (extra->hdr->read || extra->hdr->old)
mutt_set_flag (Context, extra->hdr, M_NEW, 1);
CHECK_MODE (IsHeader (extra));
CHECK_READONLY;
-#ifdef USE_IMAP
- CHECK_IMAP_ACL (IMAP_ACL_DELETE);
-#endif
+ CHECK_MX_ACL (Context, ACL_DELETE, _("Undeletion"));
mutt_set_flag (Context, extra->hdr, M_DELETE, 0);
mutt_set_flag (Context, extra->hdr, M_PURGED, 0);
CHECK_MODE (IsHeader (extra));
CHECK_READONLY;
-#ifdef USE_IMAP
- CHECK_IMAP_ACL (IMAP_ACL_DELETE);
-#endif
+ CHECK_MX_ACL (Context, ACL_DELETE, _("Undeletion"));
r = mutt_thread_set_flag (extra->hdr, M_DELETE, 0,
ch == OP_UNDELETE_THREAD ? 0 : 1)
break;
case OP_BUFFY_LIST:
- mutt_buffy_list ();
+ buffy_list ();
redraw |= REDRAW_SIDEBAR;
break;
case OP_SIDEBAR_NEXT_NEW:
case OP_SIDEBAR_PREV:
case OP_SIDEBAR_PREV_NEW:
- scroll_sidebar (ch, MENU_PAGER);
+ sidebar_scroll (ch, MENU_PAGER);
break;
default:
ch = -1;
cleanup_quote (&QuoteList);
for (i = 0; i < maxLine; i++) {
- FREE (&(lineInfo[i].syntax));
+ mem_free (&(lineInfo[i].syntax));
if (SearchCompiled && lineInfo[i].search)
- FREE (&(lineInfo[i].search));
+ mem_free (&(lineInfo[i].search));
}
if (SearchCompiled) {
regfree (&SearchRE);
SearchCompiled = 0;
}
- FREE (&lineInfo);
+ mem_free (&lineInfo);
if (index)
mutt_menuDestroy (&index);
return (rc != -1 ? rc : 0);