projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
browser.c
diff --git
a/browser.c
b/browser.c
index
1dbc644
..
7f839c9
100644
(file)
--- a/
browser.c
+++ b/
browser.c
@@
-12,15
+12,16
@@
#endif
#include "mutt.h"
#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 "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 "browser.h"
#ifdef USE_IMAP
#include "imap.h"
+#include "imap/mx_imap.h"
#endif
#ifdef USE_NNTP
#include "nntp.h"
#endif
#ifdef USE_NNTP
#include "nntp.h"
@@
-90,7
+91,7
@@
static int browser_compare_subject (const void *a, const void *b)
struct folder_file *pa = (struct folder_file *) a;
struct folder_file *pb = (struct folder_file *) b;
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);
}
return ((BrowserSort & SORT_REVERSE) ? -r : r);
}
@@
-271,7
+272,7
@@
static const char *folder_format_str (char *dest, size_t destlen, char op,
case 'N':
#ifdef USE_IMAP
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);
if (!optional) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
snprintf (dest, destlen, tmp, folder->ff->new);
@@
-484,7
+485,7
@@
static int examine_directory (MUTTMENU * menu, struct browser_state *state,
if (!(data = (NNTP_DATA *) tmp->data))
continue;
if (prefix && *prefix && strncmp (prefix, data->group,
if (!(data = (NNTP_DATA *) tmp->data))
continue;
if (prefix && *prefix && strncmp (prefix, data->group,
-
mutt
_strlen (prefix)) != 0)
+
safe
_strlen (prefix)) != 0)
continue;
if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.not))
continue;
continue;
if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.not))
continue;
@@
-529,11
+530,11
@@
static int examine_directory (MUTTMENU * menu, struct browser_state *state,
init_state (state, menu);
while ((de = readdir (dp)) != NULL) {
init_state (state, menu);
while ((de = readdir (dp)) != NULL) {
- if (
mutt
_strcmp (de->d_name, ".") == 0)
+ if (
safe
_strcmp (de->d_name, ".") == 0)
continue; /* we don't need . */
if (prefix && *prefix
continue; /* we don't need . */
if (prefix && *prefix
- &&
mutt_strncmp (prefix, de->d_name, mutt
_strlen (prefix)) != 0)
+ &&
safe_strncmp (prefix, de->d_name, safe
_strlen (prefix)) != 0)
continue;
if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.not))
continue;
continue;
if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.not))
continue;
@@
-595,20
+596,21
@@
static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state)
for (i = 0; i < Incoming->length; i++) {
tmp = (BUFFY*) Incoming->data[i];
for (i = 0; i < Incoming->length; i++) {
tmp = (BUFFY*) Incoming->data[i];
+ tmp->magic = mx_get_magic (tmp->path);
#ifdef USE_IMAP
#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
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
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, tmp->path, NULL, NULL, tmp->new);
continue;
}
@@
-765,7
+767,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
if (*f) {
mutt_expand_path (f, flen);
#ifdef USE_IMAP
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);
init_state (&state, NULL);
state.imap_browse = 1;
imap_browse (f, &state);
@@
-773,7
+775,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
}
else {
#endif
}
else {
#endif
- for (i =
mutt
_strlen (f) - 1; i > 0 && f[i] != '/'; i--);
+ for (i =
safe
_strlen (f) - 1; i > 0 && f[i] != '/'; i--);
if (i > 0) {
if (f[0] == '/') {
if (i > sizeof (LastDir) - 1)
if (i > 0) {
if (f[0] == '/') {
if (i > sizeof (LastDir) - 1)
@@
-810,7
+812,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
strfcpy (LastDir, NONULL (Maildir), sizeof (LastDir));
#ifdef USE_IMAP
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);
init_state (&state, NULL);
state.imap_browse = 1;
imap_browse (LastDir, &state);
@@
-889,8
+891,8
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
/* save the old directory */
strfcpy (OldLastDir, LastDir, sizeof (OldLastDir));
/* save the old directory */
strfcpy (OldLastDir, LastDir, sizeof (OldLastDir));
- if (
mutt
_strcmp (state.entry[menu->current].name, "..") == 0) {
- if (
mutt_strcmp ("..", LastDir + mutt
_strlen (LastDir) - 2) == 0)
+ if (
safe
_strcmp (state.entry[menu->current].name, "..") == 0) {
+ if (
safe_strcmp ("..", LastDir + safe
_strlen (LastDir) - 2) == 0)
strcat (LastDir, "/.."); /* __STRCAT_CHECKED__ */
else {
char *p = strrchr (LastDir + 1, '/');
strcat (LastDir, "/.."); /* __STRCAT_CHECKED__ */
else {
char *p = strrchr (LastDir + 1, '/');
@@
-918,7
+920,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
strfcpy (LastDir, state.entry[menu->current].name,
sizeof (LastDir));
/* tack on delimiter here */
strfcpy (LastDir, state.entry[menu->current].name,
sizeof (LastDir));
/* tack on delimiter here */
- n =
mutt
_strlen (LastDir) + 1;
+ n =
safe
_strlen (LastDir) + 1;
/* special case "" needs no delimiter */
url_parse_ciss (&url, state.entry[menu->current].name);
/* special case "" needs no delimiter */
url_parse_ciss (&url, state.entry[menu->current].name);
@@
-1123,7
+1125,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
#endif
{
/* add '/' at the end of the directory name if not already there */
#endif
{
/* add '/' at the end of the directory name if not already there */
- int len =
mutt
_strlen (LastDir);
+ int len =
safe
_strlen (LastDir);
if (len && LastDir[len - 1] != '/' && sizeof (buf) > len)
buf[len] = '/';
if (len && LastDir[len - 1] != '/' && sizeof (buf) > len)
buf[len] = '/';
@@
-1134,7
+1136,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
buffy = 0;
mutt_expand_path (buf, sizeof (buf));
#ifdef USE_IMAP
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);
strfcpy (LastDir, buf, sizeof (LastDir));
destroy_state (&state);
init_state (&state, NULL);
@@
-1199,7
+1201,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
mutt_error ("%s", buf);
}
else {
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;
regfree (Mask.rx);
FREE (&Mask.rx);
Mask.rx = rx;
@@
-1291,7
+1293,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
goto bail;
}
#ifdef USE_IMAP
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);
init_state (&state, NULL);
state.imap_browse = 1;
imap_browse (LastDir, &state);