projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
string documentation.
[apps/madmutt.git]
/
browser.c
diff --git
a/browser.c
b/browser.c
index
09b85d1
..
fd92753
100644
(file)
--- a/
browser.c
+++ b/
browser.c
@@
-17,22
+17,19
@@
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
#include <lib-ui/sidebar.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 "mutt.h"
-#include "mx.h"
#include "buffy.h"
#include "sort.h"
#include "browser.h"
#include "attach.h"
#include <imap/imap.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
#ifdef USE_NNTP
-#include
"nntp.h"
+#include
<nntp/nntp.h>
#endif
#endif
-#include "lib/list.h"
-
static struct mapping_t FolderHelp[] = {
{N_("Exit"), OP_EXIT},
{N_("Chdir"), OP_CHANGE_DIRECTORY},
static struct mapping_t FolderHelp[] = {
{N_("Exit"), OP_EXIT},
{N_("Chdir"), OP_CHANGE_DIRECTORY},
@@
-154,7
+151,7
@@
static const char *folder_format_str (char *dest, ssize_t destlen, char op,
const char *elsestring,
unsigned long data, format_flag flags)
{
const char *elsestring,
unsigned long data, format_flag flags)
{
- char fn[S
HORT_STRING], tmp[SHORT_
STRING], permission[11], date[16];
+ char fn[S
TRING], tmp[
STRING], permission[11], date[16];
const char *t_fmt;
time_t tnow;
FOLDER *folder = (FOLDER *) data;
const char *t_fmt;
time_t tnow;
FOLDER *folder = (FOLDER *) data;
@@
-319,7
+316,7
@@
static const char *newsgroup_format_str (char *dest, ssize_t destlen, char op,
unsigned long data,
format_flag flags)
{
unsigned long data,
format_flag flags)
{
- char fn[S
HORT_STRING], tmp[SHORT_
STRING];
+ char fn[S
TRING], tmp[
STRING];
FOLDER *folder = (FOLDER *) data;
switch (op) {
FOLDER *folder = (FOLDER *) data;
switch (op) {
@@
-465,8
+462,7
@@
static int examine_directory (MUTTMENU * menu, struct browser_state *state,
if (!(data = (NNTP_DATA *) tmp->data))
continue;
nntp_sync_sidebar (data);
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;
continue;
if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.not))
continue;
@@
-476,7
+472,7
@@
static int examine_directory (MUTTMENU * menu, struct browser_state *state,
add_folder (menu, state, data->group, NULL, data->new);
#endif
}
add_folder (menu, state, data->group, NULL, data->new);
#endif
}
- sidebar_draw (
CurrentMenu
);
+ sidebar_draw ();
}
else
#endif /* USE_NNTP */
}
else
#endif /* USE_NNTP */
@@
-484,7
+480,7
@@
static int examine_directory (MUTTMENU * menu, struct browser_state *state,
struct stat s;
DIR *dp;
struct dirent *de;
struct stat s;
DIR *dp;
struct dirent *de;
- char buffer[_POSIX_PATH_MAX + S
HORT_S
TRING];
+ char buffer[_POSIX_PATH_MAX + STRING];
int i = -1;
while (stat (d, &s) == -1) {
int i = -1;
while (stat (d, &s) == -1) {
@@
-519,8
+515,7
@@
static int examine_directory (MUTTMENU * menu, struct browser_state *state,
if (m_strcmp(de->d_name, ".") == 0)
continue; /* we don't need . */
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;
continue;
if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.not))
continue;
@@
-535,14
+530,14
@@
static int examine_directory (MUTTMENU * menu, struct browser_state *state,
i = buffy_lookup (buffer);
#ifdef USE_NNTP
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
#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);
}
#endif
}
closedir (dp);
}
- sidebar_draw (
CurrentMenu
);
+ sidebar_draw ();
browser_sort (state);
return 0;
}
browser_sort (state);
return 0;
}
@@
-570,7
+565,7
@@
static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state)
(!option (OPTSHOWONLYUNREAD)|| data->unread))))
add_folder (menu, state, data->group, NULL, data, data->new);
}
(!option (OPTSHOWONLYUNREAD)|| data->unread))))
add_folder (menu, state, data->group, NULL, data, data->new);
}
- sidebar_draw (
CurrentMenu
);
+ sidebar_draw ();
}
else
#endif
}
else
#endif
@@
-578,14
+573,14
@@
static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state)
int i = 0;
BUFFY* tmp;
int i = 0;
BUFFY* tmp;
- if (!Incoming)
+ if (!Incoming
.len
)
return (-1);
buffy_check (0);
init_state (state, menu);
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
tmp->magic = mx_get_magic (tmp->path);
if (tmp->magic == M_IMAP) {
#ifdef USE_NNTP
@@
-722,7
+717,7
@@
void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
{
char buf[_POSIX_PATH_MAX];
char prefix[_POSIX_PATH_MAX] = "";
{
char buf[_POSIX_PATH_MAX];
char prefix[_POSIX_PATH_MAX] = "";
- char helpstr[S
HORT_S
TRING];
+ char helpstr[STRING];
char title[STRING];
struct browser_state state;
MUTTMENU *menu;
char title[STRING];
struct browser_state state;
MUTTMENU *menu;
@@
-783,7
+778,7
@@
void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
}
else {
if (f[0] == '/')
}
else {
if (f[0] == '/')
- strcpy (LastDir, "/"); /* __STRCPY_CHECKED__ */
+ m_strcpy(LastDir, sizeof(LastDir), "/");
else
getcwd (LastDir, sizeof (LastDir));
}
else
getcwd (LastDir, sizeof (LastDir));
}
@@
-874,7
+869,7
@@
void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
if (m_strcmp(state.entry[menu->current].name, "..") == 0) {
if (m_strcmp("..", LastDir + m_strlen(LastDir) - 2) == 0)
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, '/');
else {
char *p = strrchr (LastDir + 1, '/');
@@
-884,7
+879,7
@@
void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
if (LastDir[0] == '/')
LastDir[1] = 0;
else
if (LastDir[0] == '/')
LastDir[1] = 0;
else
- strcat (LastDir, "/.."); /* __STRCAT_CHECKED__ */
+ m_strcat(LastDir, sizeof(LastDir), "/..");
}
}
}
}
}
}
@@
-1059,7
+1054,7
@@
void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
if (!state.entry[menu->current].imap)
mutt_error (_("Delete is only supported for IMAP mailboxes"));
else {
if (!state.entry[menu->current].imap)
mutt_error (_("Delete is only supported for IMAP mailboxes"));
else {
- char msg[S
HORT_S
TRING];
+ char msg[STRING];
IMAP_MBOX mx;
int nentry = menu->current;
IMAP_MBOX mx;
int nentry = menu->current;