#endif
#include "mutt.h"
+#include "mx.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "buffy.h"
#include "mapping.h"
#include "sort.h"
-#include "mailbox.h"
#include "browser.h"
#ifdef USE_IMAP
#include "imap.h"
+#include "imap/mx_imap.h"
#endif
#ifdef USE_NNTP
#include "nntp.h"
#endif
#include "sidebar.h"
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+#include "lib/list.h"
+
#include <stdlib.h>
#include <dirent.h>
#include <string.h>
struct folder_file *pa = (struct folder_file *) a;
struct folder_file *pb = (struct folder_file *) b;
- int r = mutt_strcoll (pa->name, pb->name);
+ int r = safe_strcoll (pa->name, pb->name);
return ((BrowserSort & SORT_REVERSE) ? -r : r);
}
case 'N':
#ifdef USE_IMAP
- if (mx_is_imap (folder->ff->desc)) {
+ if (imap_is_magic (folder->ff->desc, NULL) == M_IMAP) {
if (!optional) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
snprintf (dest, destlen, tmp, folder->ff->new);
NNTP_DATA *data;
NNTP_SERVER *news = CurrentNewsSrv;
-/* mutt_buffy_check (0); */
+/* buffy_check (0); */
init_state (state, menu);
for (tmp = news->list; tmp; tmp = tmp->next) {
if (!(data = (NNTP_DATA *) tmp->data))
continue;
if (prefix && *prefix && strncmp (prefix, data->group,
- strlen (prefix)) != 0)
+ mutt_strlen (prefix)) != 0)
continue;
if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.not))
continue;
DIR *dp;
struct dirent *de;
char buffer[_POSIX_PATH_MAX + SHORT_STRING];
- BUFFY *tmp;
+ int i = -1;
while (stat (d, &s) == -1) {
if (errno == ENOENT) {
return (-1);
}
- mutt_buffy_check (0);
+ buffy_check (0);
if ((dp = opendir (d)) == NULL) {
mutt_perror (d);
continue; /* we don't need . */
if (prefix && *prefix
- && mutt_strncmp (prefix, de->d_name, mutt_strlen (prefix)) != 0)
+ && safe_strncmp (prefix, de->d_name, mutt_strlen (prefix)) != 0)
continue;
if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.not))
continue;
(!S_ISLNK (s.st_mode)))
continue;
- tmp = Incoming;
- while (tmp && mutt_strcmp (buffer, tmp->path))
- tmp = tmp->next;
- add_folder (menu, state, de->d_name, &s, NULL, (tmp) ? tmp->new : 0);
+ i = buffy_lookup (buffer);
+ add_folder (menu, state, de->d_name, &s, NULL, i >= 0 ? ((BUFFY*) Incoming->data[i])->new : 0);
}
closedir (dp);
}
- draw_sidebar (CurrentMenu);
+ sidebar_draw (CurrentMenu);
browser_sort (state);
return 0;
}
NNTP_DATA *data;
NNTP_SERVER *news = CurrentNewsSrv;
-/* mutt_buffy_check (0); */
+/* buffy_check (0); */
init_state (state, menu);
for (tmp = news->list; tmp; tmp = tmp->next) {
else
#endif
{
- BUFFY *tmp = Incoming;
+ int i = 0;
+ BUFFY* tmp;
if (!Incoming)
return (-1);
- mutt_buffy_check (0);
+ buffy_check (0);
init_state (state, menu);
- do {
+ for (i = 0; i < Incoming->length; i++) {
+ tmp = (BUFFY*) Incoming->data[i];
+ tmp->magic = mx_get_magic (tmp->path);
#ifdef USE_IMAP
- if (mx_is_imap (tmp->path)) {
+ if (tmp->magic == M_IMAP) {
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
continue;
}
#endif
#ifdef USE_POP
- if (mx_is_pop (tmp->path)) {
+ if (tmp->magic == M_POP) {
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
continue;
}
#endif
#ifdef USE_NNTP
- if (mx_is_nntp (tmp->path)) {
+ if (tmp->magic == M_NNTP) {
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
continue;
}
add_folder (menu, state, buffer, &s, NULL, tmp->new);
}
- while ((tmp = tmp->next));
}
browser_sort (state);
return 0;
else
#endif
if (buffy)
- snprintf (title, titlelen, _("Mailboxes [%d]"), mutt_buffy_check (0));
+ snprintf (title, titlelen, _("Mailboxes [%d]"), buffy_check (0));
else {
strfcpy (path, LastDir, sizeof (path));
mutt_pretty_mailbox (path);
if (*f) {
mutt_expand_path (f, flen);
#ifdef USE_IMAP
- if (mx_is_imap (f)) {
+ if (imap_is_magic (f, NULL) == M_IMAP) {
init_state (&state, NULL);
state.imap_browse = 1;
imap_browse (f, &state);
strfcpy (LastDir, NONULL (Maildir), sizeof (LastDir));
#ifdef USE_IMAP
- if (!buffy && mx_is_imap (LastDir)) {
+ if (!buffy && imap_is_magic (LastDir, NULL) == M_IMAP) {
init_state (&state, NULL);
state.imap_browse = 1;
imap_browse (LastDir, &state);
strfcpy (LastDir, state.entry[menu->current].name,
sizeof (LastDir));
/* tack on delimiter here */
- n = strlen (LastDir) + 1;
+ n = mutt_strlen (LastDir) + 1;
/* special case "" needs no delimiter */
url_parse_ciss (&url, state.entry[menu->current].name);
buffy = 0;
mutt_expand_path (buf, sizeof (buf));
#ifdef USE_IMAP
- if (mx_is_imap (buf)) {
+ if (imap_is_magic (buf, NULL) == M_IMAP) {
strfcpy (LastDir, buf, sizeof (LastDir));
destroy_state (&state);
init_state (&state, NULL);
mutt_error ("%s", buf);
}
else {
- mutt_str_replace (&Mask.pattern, buf);
+ str_replace (&Mask.pattern, buf);
regfree (Mask.rx);
FREE (&Mask.rx);
Mask.rx = rx;
goto bail;
}
#ifdef USE_IMAP
- else if (mx_is_imap (LastDir)) {
+ else if (imap_is_magic (LastDir, NULL) == M_IMAP) {
init_state (&state, NULL);
state.imap_browse = 1;
imap_browse (LastDir, &state);
break;
case OP_BUFFY_LIST:
- mutt_buffy_list ();
+ buffy_list ();
break;
case OP_BROWSER_NEW_FILE: