projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wibble
[apps/madmutt.git]
/
browser.c
diff --git
a/browser.c
b/browser.c
index
676aca9
..
43608e7
100644
(file)
--- a/
browser.c
+++ b/
browser.c
@@
-17,9
+17,9
@@
#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 "buffy.h"
#include "sort.h"
#include "browser.h"
@@
-27,7
+27,7
@@
#include <imap/imap.h>
#ifdef USE_NNTP
#include <imap/imap.h>
#ifdef USE_NNTP
-#include
"nntp.h"
+#include
<nntp/nntp.h>
#endif
static struct mapping_t FolderHelp[] = {
#endif
static struct mapping_t FolderHelp[] = {
@@
-65,9
+65,9
@@
static void destroy_state (struct browser_state *state)
int c;
for (c = 0; c < state->entrylen; c++) {
int c;
for (c = 0; c < state->entrylen; c++) {
- p_delete(&
((state->entry)[c].name)
);
- p_delete(&
((state->entry)[c].desc)
);
- p_delete(&
((state->entry)[c].st)
);
+ p_delete(&
state->entry[c].name
);
+ p_delete(&
state->entry[c].desc
);
+ p_delete(&
state->entry[c].st
);
}
p_delete(&state->folder);
p_delete(&state->entry);
}
p_delete(&state->folder);
p_delete(&state->entry);
@@
-145,16
+145,16
@@
static int link_is_dir (const char *folder, const char *path)
return 0;
}
return 0;
}
-static const char *
folder_format_str (char *dest, ssize_t destlen, char op,
-
const char *src, const char *fmt
,
-
const char *ifstring
,
-
const char *elsestring
,
-
unsigned long
data, format_flag flags)
+static const char *
+
folder_format_str(char *dest, ssize_t destlen, char op
,
+
const char *src, const char *fmt
,
+
const char *ifstr, const char *elstr
,
+
anytype
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;
const char *t_fmt;
time_t tnow;
- FOLDER *folder =
(FOLDER *) data
;
+ FOLDER *folder =
data.ptr
;
struct passwd *pw;
struct group *gr;
int optional = (flags & M_FORMAT_OPTIONAL);
struct passwd *pw;
struct group *gr;
int optional = (flags & M_FORMAT_OPTIONAL);
@@
-184,9
+184,9
@@
static const char *folder_format_str (char *dest, ssize_t destlen, char op,
const char *s;
if (folder->ff->imap)
const char *s;
if (folder->ff->imap)
- s = NONULL
(folder->ff->desc);
+ s = NONULL(folder->ff->desc);
else
else
- s = NONULL
(folder->ff->name);
+ s = NONULL(folder->ff->name);
snprintf (fn, sizeof (fn), "%s%s", s,
folder->ff->st ? (S_ISLNK (folder->ff->st->st_mode) ? "@" :
snprintf (fn, sizeof (fn), "%s%s", s,
folder->ff->st ? (S_ISLNK (folder->ff->st->st_mode) ? "@" :
@@
-200,9
+200,8
@@
static const char *folder_format_str (char *dest, ssize_t destlen, char op,
case 'F':
if (folder->ff->st != NULL) {
snprintf (permission, sizeof (permission), "%c%c%c%c%c%c%c%c%c%c",
case 'F':
if (folder->ff->st != NULL) {
snprintf (permission, sizeof (permission), "%c%c%c%c%c%c%c%c%c%c",
- S_ISDIR (folder->ff->st->
- st_mode) ? 'd' : (S_ISLNK (folder->ff->st->
- st_mode) ? 'l' : '-'),
+ S_ISDIR(folder->ff->st-> st_mode)
+ ? 'd' : (S_ISLNK(folder->ff->st-> st_mode) ? 'l' : '-'),
(folder->ff->st->st_mode & S_IRUSR) != 0 ? 'r' : '-',
(folder->ff->st->st_mode & S_IWUSR) != 0 ? 'w' : '-',
(folder->ff->st->st_mode & S_ISUID) !=
(folder->ff->st->st_mode & S_IRUSR) != 0 ? 'r' : '-',
(folder->ff->st->st_mode & S_IWUSR) != 0 ? 'w' : '-',
(folder->ff->st->st_mode & S_ISUID) !=
@@
-300,24
+299,23
@@
static const char *folder_format_str (char *dest, ssize_t destlen, char op,
break;
}
break;
}
- if (optional)
- mutt_FormatString (dest, destlen, ifstring, folder_format_str, data, 0);
- else if (flags & M_FORMAT_OPTIONAL)
- mutt_FormatString (dest, destlen, elsestring, folder_format_str, data, 0);
- return (src);
+ if (flags & M_FORMAT_OPTIONAL)
+ m_strformat(dest, destlen, 0, optional ? ifstr : elstr,
+ folder_format_str, data, 0);
+
+ return src;
}
#ifdef USE_NNTP
}
#ifdef USE_NNTP
-static const char *newsgroup_format_str (char *dest, ssize_t destlen, char op,
- const char *src, const char *fmt,
- const char *ifstring,
- const char *elsestring,
- unsigned long data,
- format_flag flags)
+static const char *
+newsgroup_format_str(char *dest, ssize_t destlen, char op,
+ const char *src, const char *fmt,
+ const char *ifstr, const char *elstr,
+ anytype data, format_flag flags)
{
{
- char fn[S
HORT_STRING], tmp[SHORT_
STRING];
- FOLDER *folder =
(FOLDER *) data
;
+ char fn[S
TRING], tmp[
STRING];
+ FOLDER *folder =
data.ptr
;
switch (op) {
case 'C':
switch (op) {
case 'C':
@@
-350,11
+348,11
@@
static const char *newsgroup_format_str (char *dest, ssize_t destlen, char op,
case 's':
if (flags & M_FORMAT_OPTIONAL) {
if (folder->ff->nd->unread != 0)
case 's':
if (flags & M_FORMAT_OPTIONAL) {
if (folder->ff->nd->unread != 0)
- m
utt_FormatString (dest, destlen, ifstring
, newsgroup_format_str,
-
data, flags);
+ m
_strformat(dest, destlen, 0, ifstr
, newsgroup_format_str,
+ data, flags);
else
else
- m
utt_FormatString (dest, destlen, elsestring
, newsgroup_format_str,
-
data, flags);
+ m
_strformat (dest, destlen, 0, elstr
, newsgroup_format_str,
+ data, flags);
}
else if (Context && Context->data == folder->ff->nd) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
}
else if (Context && Context->data == folder->ff->nd) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
@@
-462,16
+460,11
@@
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;
continue;
- if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.n
ot
))
+ if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.n
eg
))
continue;
continue;
-#ifdef USE_NNTP
add_folder (menu, state, data->group, NULL, data, data->new);
add_folder (menu, state, data->group, NULL, data, data->new);
-#else
- add_folder (menu, state, data->group, NULL, data->new);
-#endif
}
sidebar_draw ();
}
}
sidebar_draw ();
}
@@
-481,7
+474,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) {
@@
-516,10
+509,9
@@
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;
continue;
- if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.n
ot
))
+ if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.n
eg
))
continue;
mutt_concat_path(buffer, sizeof(buffer), d, de->d_name);
continue;
mutt_concat_path(buffer, sizeof(buffer), d, de->d_name);
@@
-647,12
+639,12
@@
static void folder_entry (char *s, ssize_t slen, MUTTMENU * menu, int num)
#ifdef USE_NNTP
if (option (OPTNEWS))
#ifdef USE_NNTP
if (option (OPTNEWS))
- m
utt_FormatString (s, slen, NONULL (GroupFormat), newsgroup_format_st
r,
-
(unsigned long) &folder, M_FORMAT_ARROWCURSOR
);
+ m
_strformat(s, slen, COLS - SW, GroupFormat, newsgroup_format_str, &folde
r,
+
option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0
);
else
#endif
else
#endif
- m
utt_FormatString (s, slen, NONULL (FolderFormat), folder_format_st
r,
-
(unsigned long) &folder, M_FORMAT_ARROWCURSOR
);
+ m
_strformat(s, slen, COLS - SW, FolderFormat, folder_format_str, &folde
r,
+
option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0
);
}
static void init_menu (struct browser_state *state, MUTTMENU * menu,
}
static void init_menu (struct browser_state *state, MUTTMENU * menu,
@@
-719,7
+711,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;
@@
-780,7
+772,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));
}
@@
-871,7
+863,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, '/');
@@
-881,7
+873,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), "/..");
}
}
}
}
}
}
@@
-934,7
+926,7
@@
void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
/* try to restore the old values */
m_strcpy(LastDir, sizeof(LastDir), OldLastDir);
if (examine_directory (menu, &state, LastDir, prefix) == -1) {
/* try to restore the old values */
m_strcpy(LastDir, sizeof(LastDir), OldLastDir);
if (examine_directory (menu, &state, LastDir, prefix) == -1) {
- m_strcpy(LastDir, sizeof(LastDir), NONULL(
H
omedir));
+ m_strcpy(LastDir, sizeof(LastDir), NONULL(
mod_core.h
omedir));
goto bail;
}
}
goto bail;
}
}
@@
-1056,7
+1048,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;
@@
-1152,7
+1144,7
@@
void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
if (mutt_get_field (_("File Mask: "), buf, sizeof (buf), 0) == 0) {
regex_t *rx = p_new(regex_t, 1);
char *s = buf;
if (mutt_get_field (_("File Mask: "), buf, sizeof (buf), 0) == 0) {
regex_t *rx = p_new(regex_t, 1);
char *s = buf;
- int n
ot
= 0, err;
+ int n
eg
= 0, err;
buffy = 0;
/* assume that the user wants to see everything */
buffy = 0;
/* assume that the user wants to see everything */
@@
-1161,7
+1153,7
@@
void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
s = vskipspaces(s);
if (*s == '!') {
s = vskipspaces(s + 1);
s = vskipspaces(s);
if (*s == '!') {
s = vskipspaces(s + 1);
- n
ot
= 1;
+ n
eg
= 1;
}
if ((err = REGCOMP (rx, s, REG_NOSUB)) != 0) {
}
if ((err = REGCOMP (rx, s, REG_NOSUB)) != 0) {
@@
-1175,7
+1167,7
@@
void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
regfree (Mask.rx);
p_delete(&Mask.rx);
Mask.rx = rx;
regfree (Mask.rx);
p_delete(&Mask.rx);
Mask.rx = rx;
- Mask.n
ot = not
;
+ Mask.n
eg = neg
;
destroy_state (&state);
if (state.imap_browse) {
destroy_state (&state);
if (state.imap_browse) {