* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <dirent.h>
+#include <pwd.h>
+#include <grp.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
+#include <lib-ui/sidebar.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
-#include "mx.h"
#include "buffy.h"
#include "sort.h"
#include "browser.h"
#include "attach.h"
#include <imap/imap.h>
-#include <imap/mx_imap.h>
#ifdef USE_NNTP
-#include "nntp.h"
+#include <nntp/nntp.h>
#endif
-#include "sidebar.h"
-
-#include "lib/list.h"
-
-#include <stdlib.h>
-#include <dirent.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
static struct mapping_t FolderHelp[] = {
{N_("Exit"), OP_EXIT},
const char *elsestring,
unsigned long data, format_flag flags)
{
- char fn[SHORT_STRING], tmp[SHORT_STRING], permission[11], date[16];
+ char fn[STRING], tmp[STRING], permission[11], date[16];
const char *t_fmt;
time_t tnow;
FOLDER *folder = (FOLDER *) data;
unsigned long data,
format_flag flags)
{
- char fn[SHORT_STRING], tmp[SHORT_STRING];
+ char fn[STRING], tmp[STRING];
FOLDER *folder = (FOLDER *) data;
switch (op) {
if (!(data = (NNTP_DATA *) tmp->data))
continue;
nntp_sync_sidebar (data);
- if (prefix && *prefix && strncmp (prefix, data->group,
- m_strlen(prefix)) != 0)
+ if (m_strncmp (prefix, data->group, m_strlen(prefix)) != 0)
continue;
if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.not))
continue;
add_folder (menu, state, data->group, NULL, data->new);
#endif
}
- sidebar_draw (CurrentMenu);
+ sidebar_draw ();
}
else
#endif /* USE_NNTP */
struct stat s;
DIR *dp;
struct dirent *de;
- char buffer[_POSIX_PATH_MAX + SHORT_STRING];
+ char buffer[_POSIX_PATH_MAX + STRING];
int i = -1;
while (stat (d, &s) == -1) {
if (m_strcmp(de->d_name, ".") == 0)
continue; /* we don't need . */
- if (prefix && *prefix
- && m_strncmp(prefix, de->d_name, m_strlen(prefix)) != 0)
+ if (m_strncmp(prefix, de->d_name, m_strlen(prefix)) != 0)
continue;
if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.not))
continue;
i = buffy_lookup (buffer);
#ifdef USE_NNTP
- add_folder (menu, state, de->d_name, &s, NULL, i >= 0 ? ((BUFFY*) Incoming->data[i])->new : 0);
+ add_folder (menu, state, de->d_name, &s, NULL, i >= 0 ? Incoming.arr[i]->new : 0);
#else
- add_folder (menu, state, de->d_name, &s, i >= 0 ? ((BUFFY*) Incoming->data[i])->new : 0);
+ add_folder (menu, state, de->d_name, &s, i >= 0 ? Incoming.arr[i]->new : 0);
#endif
}
closedir (dp);
}
- sidebar_draw (CurrentMenu);
+ sidebar_draw ();
browser_sort (state);
return 0;
}
(!option (OPTSHOWONLYUNREAD)|| data->unread))))
add_folder (menu, state, data->group, NULL, data, data->new);
}
- sidebar_draw (CurrentMenu);
+ sidebar_draw ();
}
else
#endif
{
- unsigned int i = 0;
+ int i = 0;
BUFFY* tmp;
- if (!Incoming)
+ if (!Incoming.len)
return (-1);
buffy_check (0);
init_state (state, menu);
- for (i = 0; i < Incoming->length; i++) {
- tmp = (BUFFY*) Incoming->data[i];
+ for (i = 0; i < Incoming.len; i++) {
+ tmp = Incoming.arr[i];
tmp->magic = mx_get_magic (tmp->path);
if (tmp->magic == M_IMAP) {
#ifdef USE_NNTP
{
char buf[_POSIX_PATH_MAX];
char prefix[_POSIX_PATH_MAX] = "";
- char helpstr[SHORT_STRING];
+ char helpstr[STRING];
char title[STRING];
struct browser_state state;
MUTTMENU *menu;
}
else {
if (f[0] == '/')
- strcpy (LastDir, "/"); /* __STRCPY_CHECKED__ */
+ m_strcpy(LastDir, sizeof(LastDir), "/");
else
getcwd (LastDir, sizeof (LastDir));
}
if (m_strcmp(state.entry[menu->current].name, "..") == 0) {
if (m_strcmp("..", LastDir + m_strlen(LastDir) - 2) == 0)
- strcat (LastDir, "/.."); /* __STRCAT_CHECKED__ */
+ m_strcat(LastDir, sizeof(LastDir), "/..");
else {
char *p = strrchr (LastDir + 1, '/');
if (LastDir[0] == '/')
LastDir[1] = 0;
else
- strcat (LastDir, "/.."); /* __STRCAT_CHECKED__ */
+ m_strcat(LastDir, sizeof(LastDir), "/..");
}
}
}
if (!state.entry[menu->current].imap)
mutt_error (_("Delete is only supported for IMAP mailboxes"));
else {
- char msg[SHORT_STRING];
+ char msg[STRING];
IMAP_MBOX mx;
int nentry = menu->current;
b = mutt_make_file_attach (nbuf);
if (b != NULL) {
mutt_view_attachment (NULL, b, M_REGULAR, NULL, NULL, 0);
- mutt_free_body (&b);
+ body_list_wipe(&b);
menu->redraw = REDRAW_FULL;
}
else
case OP_CATCHUP:
case OP_UNCATCHUP:
if (option (OPTNEWS)) {
- struct folder_file *f = &state.entry[menu->current];
+ struct folder_file *folder_f = &state.entry[menu->current];
NNTP_DATA *nd;
if (i == OP_CATCHUP)
- nd = mutt_newsgroup_catchup (CurrentNewsSrv, f->name);
+ nd = mutt_newsgroup_catchup (CurrentNewsSrv, folder_f->name);
else
- nd = mutt_newsgroup_uncatchup (CurrentNewsSrv, f->name);
+ nd = mutt_newsgroup_uncatchup (CurrentNewsSrv, folder_f->name);
if (nd) {
-/* FOLDER folder;
- struct folder_file ff;
- char buffer[_POSIX_PATH_MAX + SHORT_STRING];
-
- folder.ff = &ff;
- folder.ff->name = f->name;
- folder.ff->st = NULL;
- folder.ff->is_new = nd->new;
- folder.ff->nd = nd;
- p_delete(&f->desc);
- mutt_FormatString (buffer, sizeof (buffer), NONULL(GroupFormat),
- newsgroup_format_str, (unsigned long) &folder,
- M_FORMAT_ARROWCURSOR);
- f->desc = m_strdup(buffer); */
if (menu->current + 1 < menu->max)
menu->current++;
menu->redraw = REDRAW_MOTION_RESYNCH;
}
for (; j < state.entrylen; j++) {
- struct folder_file *f = &state.entry[j];
+ struct folder_file *folderf = &state.entry[j];
if (i == OP_BROWSER_SUBSCRIBE || i == OP_BROWSER_UNSUBSCRIBE ||
- regexec (rx, f->name, 0, NULL, 0) == 0) {
+ regexec (rx, folderf->name, 0, NULL, 0) == 0) {
if (i == OP_BROWSER_SUBSCRIBE || i == OP_SUBSCRIBE_PATTERN)
- nd = mutt_newsgroup_subscribe (news, f->name);
+ nd = mutt_newsgroup_subscribe (news, folderf->name);
else
- nd = mutt_newsgroup_unsubscribe (news, f->name);
-/* if (nd)
- {
- FOLDER folder;
- char buffer[_POSIX_PATH_MAX + SHORT_STRING];
-
- folder.name = f->name;
- folder.f = NULL;
- folder.new = nd->new;
- folder.nd = nd;
- p_delete(&f->desc);
- mutt_FormatString (buffer, sizeof (buffer), NONULL(GroupFormat),
- newsgroup_format_str, (unsigned long) &folder,
- M_FORMAT_ARROWCURSOR);
- f->desc = m_strdup(buffer);
- } */
+ nd = mutt_newsgroup_unsubscribe (news, folderf->name);
}
if (i == OP_BROWSER_SUBSCRIBE || i == OP_BROWSER_UNSUBSCRIBE) {
if (menu->current + 1 < menu->max)