/*
+ * Copyright notice from original mutt:
* Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ *
+ * Parts were written/modified by:
+ * Nico Golde <nico@ngolde.de>
+ * Andreas Krennmair <ak@synflood.at>
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
*/
#if HAVE_CONFIG_H
#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 "mutt_crypt.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>
#include <unistd.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;
if (length <= q_list->length) {
/* case 1: check the top level nodes */
- if (mutt_strncmp (qptr, q_list->prefix, length) == 0) {
+ if (safe_strncmp (qptr, q_list->prefix, length) == 0) {
if (length == q_list->length)
return q_list; /* same prefix: return the current class */
/* 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) {
+ && safe_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 (mutt_strncmp (tail_qptr, (q_list->prefix) + offset, tail_lng)
+ if (safe_strncmp (tail_qptr, (q_list->prefix) + offset, tail_lng)
== 0) {
/* same prefix: return the current class */
if (length == q_list->length)
else {
/* longer than the current prefix: try subclassing it */
if (tmp == NULL
- && mutt_strncmp (tail_qptr, (q_list->prefix) + offset,
+ && safe_strncmp (tail_qptr, (q_list->prefix) + offset,
q_list->length - offset) == 0) {
/* still a subclass: go down one level */
ptr = q_list;
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 (safe_strncmp ("\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 (safe_strncmp ("[-- ", buf, 4) == 0)
lineInfo[n].type = MT_COLOR_ATTACHMENT;
#else
else if (check_attachment_marker ((char *) raw) == 0)
}
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;
_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)),
}
/* if we're not using the index, update every time */
if (index == 0)
- draw_sidebar (MENU_PAGER);
+ sidebar_draw (MENU_PAGER);
redraw = 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);
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 || safe_strcasecmp (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;