projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drop the old string API fully.
[apps/madmutt.git]
/
browser.c
diff --git
a/browser.c
b/browser.c
index
878b6bb
..
233a7c1
100644
(file)
--- a/
browser.c
+++ b/
browser.c
@@
-15,6
+15,7
@@
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
+#include <lib-lib/mapping.h>
#include "mutt.h"
#include "enter.h"
#include "mutt.h"
#include "enter.h"
@@
-22,7
+23,6
@@
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "buffy.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "buffy.h"
-#include "mapping.h"
#include "sort.h"
#include "browser.h"
#include "attach.h"
#include "sort.h"
#include "browser.h"
#include "attach.h"
@@
-78,7
+78,7
@@
static char LastDirBackup[_POSIX_PATH_MAX] = "";
/* Frees up the memory allocated for the local-global variables. */
static void destroy_state (struct browser_state *state)
{
/* Frees up the memory allocated for the local-global variables. */
static void destroy_state (struct browser_state *state)
{
- int c;
+
unsigned
int c;
for (c = 0; c < state->entrylen; c++) {
p_delete(&((state->entry)[c].name));
for (c = 0; c < state->entrylen; c++) {
p_delete(&((state->entry)[c].name));
@@
-96,7
+96,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 = str
_coll (pa->name, pb->name
);
+ int r = str
coll(NONULL(pa->name), NONULL(pb->name)
);
return ((BrowserSort & SORT_REVERSE) ? -r : r);
}
return ((BrowserSort & SORT_REVERSE) ? -r : r);
}
@@
-423,9
+423,15
@@
static const char *newsgroup_format_str (char *dest, size_t destlen, char op,
}
#endif /* USE_NNTP */
}
#endif /* USE_NNTP */
+#ifdef USE_NNTP
static void add_folder (MUTTMENU * m, struct browser_state *state,
const char *name, const struct stat *s,
void *data, int new)
static void add_folder (MUTTMENU * m, struct browser_state *state,
const char *name, const struct stat *s,
void *data, int new)
+#else
+static void add_folder (MUTTMENU * m, struct browser_state *state,
+ const char *name, const struct stat *s,
+ int new)
+#endif
{
if (state->entrylen == state->entrymax) {
/* need to allocate more space */
{
if (state->entrylen == state->entrymax) {
/* need to allocate more space */
@@
-489,7
+495,11
@@
static int examine_directory (MUTTMENU * menu, struct browser_state *state,
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;
+#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 (CurrentMenu);
}
}
sidebar_draw (CurrentMenu);
}
@@
-535,7
+545,7
@@
static int examine_directory (MUTTMENU * menu, struct browser_state *state,
continue; /* we don't need . */
if (prefix && *prefix
continue; /* we don't need . */
if (prefix && *prefix
- &&
str_ncmp
(prefix, de->d_name, m_strlen(prefix)) != 0)
+ &&
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;
@@
-549,7
+559,11
@@
static int examine_directory (MUTTMENU * menu, struct browser_state *state,
continue;
i = buffy_lookup (buffer);
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 ? ((BUFFY*) Incoming->data[i])->new : 0);
+#else
+ add_folder (menu, state, de->d_name, &s, i >= 0 ? ((BUFFY*) Incoming->data[i])->new : 0);
+#endif
}
closedir (dp);
}
}
closedir (dp);
}
@@
-586,7
+600,7
@@
static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state)
else
#endif
{
else
#endif
{
- int i = 0;
+
unsigned
int i = 0;
BUFFY* tmp;
if (!Incoming)
BUFFY* tmp;
if (!Incoming)
@@
-600,13
+614,21
@@
static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state)
tmp->magic = mx_get_magic (tmp->path);
#ifdef USE_IMAP
if (tmp->magic == M_IMAP) {
tmp->magic = mx_get_magic (tmp->path);
#ifdef USE_IMAP
if (tmp->magic == M_IMAP) {
+#ifdef USE_NNTP
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
+#else
+ add_folder (menu, state, tmp->path, NULL, tmp->new);
+#endif
continue;
}
#endif
#ifdef USE_POP
if (tmp->magic == M_POP) {
continue;
}
#endif
#ifdef USE_POP
if (tmp->magic == M_POP) {
+#ifdef USE_NNTP
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
+#else
+ add_folder (menu, state, tmp->path, NULL, tmp->new);
+#endif
continue;
}
#endif
continue;
}
#endif
@@
-623,10
+645,14
@@
static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state)
(!S_ISLNK (s.st_mode)))
continue;
(!S_ISLNK (s.st_mode)))
continue;
-
strfcpy (buffer, NONULL (tmp->path), sizeof (buffer
));
+
m_strcpy(buffer, sizeof(buffer), NONULL(tmp->path
));
mutt_pretty_mailbox (buffer);
mutt_pretty_mailbox (buffer);
+#ifdef USE_NNTP
add_folder (menu, state, buffer, &s, NULL, tmp->new);
add_folder (menu, state, buffer, &s, NULL, tmp->new);
+#else
+ add_folder (menu, state, buffer, &s, tmp->new);
+#endif
}
}
browser_sort (state);
}
}
browser_sort (state);
@@
-688,9
+714,9
@@
static void init_menu (struct browser_state *state, MUTTMENU * menu,
else
#endif
if (buffy)
else
#endif
if (buffy)
- snprintf
(title, titlelen, _("Mailboxes [%d]"), buffy_check
(0));
+ snprintf
(title, titlelen, _("Mailboxes [%d]"), buffy_check
(0));
else {
else {
-
strfcpy (path, LastDir, sizeof (path)
);
+
m_strcpy(path, sizeof(path), LastDir
);
mutt_pretty_mailbox (path);
#ifdef USE_IMAP
if (state->imap_browse && option (OPTIMAPLSUB))
mutt_pretty_mailbox (path);
#ifdef USE_IMAP
if (state->imap_browse && option (OPTIMAPLSUB))
@@
-742,12
+768,12
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
p_clear(&state, 1);
if (!folder)
p_clear(&state, 1);
if (!folder)
-
strfcpy (LastDirBackup, LastDir, sizeof (LastDirBackup)
);
+
m_strcpy(LastDirBackup, sizeof(LastDirBackup), LastDir
);
#ifdef USE_NNTP
if (option (OPTNEWS)) {
if (*f)
#ifdef USE_NNTP
if (option (OPTNEWS)) {
if (*f)
-
strfcpy (prefix, f, sizeof (prefix)
);
+
m_strcpy(prefix, sizeof(prefix), f
);
else {
LIST *list;
else {
LIST *list;
@@
-772,14
+798,14
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
init_state (&state, NULL);
state.imap_browse = 1;
if (!imap_browse (f, &state))
init_state (&state, NULL);
state.imap_browse = 1;
if (!imap_browse (f, &state))
-
strfcpy (LastDir, state.folder, sizeof (LastDir)
);
+
m_strcpy(LastDir, sizeof(LastDir), state.folder
);
}
else {
#endif
for (i = m_strlen(f) - 1; i > 0 && f[i] != '/'; i--);
if (i > 0) {
if (f[0] == '/') {
}
else {
#endif
for (i = m_strlen(f) - 1; i > 0 && f[i] != '/'; i--);
if (i > 0) {
if (f[0] == '/') {
- i = MIN(sizeof(LastDir) - 1, i);
+ i = MIN(s
s
izeof(LastDir) - 1, i);
m_strcpy(LastDir, sizeof(LastDir), f);
}
else {
m_strcpy(LastDir, sizeof(LastDir), f);
}
else {
@@
-796,9
+822,9
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
}
if (i <= 0 && f[0] != '/')
}
if (i <= 0 && f[0] != '/')
-
strfcpy (prefix, f, sizeof (prefix)
);
+
m_strcpy(prefix, sizeof(prefix), f
);
else
else
-
strfcpy (prefix, f + i + 1, sizeof (prefix)
);
+
m_strcpy(prefix, sizeof(prefix), f + i + 1
);
killPrefix = 1;
#ifdef USE_IMAP
}
killPrefix = 1;
#ifdef USE_IMAP
}
@@
-808,7
+834,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
if (!folder)
getcwd (LastDir, sizeof (LastDir));
else if (!LastDir[0])
if (!folder)
getcwd (LastDir, sizeof (LastDir));
else if (!LastDir[0])
-
strfcpy (LastDir, NONULL (Maildir), sizeof (LastD
ir));
+
m_strcpy(LastDir, sizeof(LastDir), NONULL(Maild
ir));
#ifdef USE_IMAP
if (!buffy && imap_is_magic (LastDir, NULL) == M_IMAP) {
#ifdef USE_IMAP
if (!buffy && imap_is_magic (LastDir, NULL) == M_IMAP) {
@@
-869,12
+895,12
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
) {
/* make sure this isn't a MH or maildir mailbox */
if (buffy) {
) {
/* make sure this isn't a MH or maildir mailbox */
if (buffy) {
-
strfcpy (buf, state.entry[menu->current].name, sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), state.entry[menu->current].name
);
mutt_expand_path (buf, sizeof (buf));
}
#ifdef USE_IMAP
else if (state.imap_browse) {
mutt_expand_path (buf, sizeof (buf));
}
#ifdef USE_IMAP
else if (state.imap_browse) {
-
strfcpy (buf, state.entry[menu->current].name, sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), state.entry[menu->current].name
);
}
#endif
else
}
#endif
else
@@
-889,7
+915,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
char OldLastDir[_POSIX_PATH_MAX];
/* save the old directory */
char OldLastDir[_POSIX_PATH_MAX];
/* save the old directory */
-
strfcpy (OldLastDir, LastDir, sizeof (OldLastDir)
);
+
m_strcpy(OldLastDir, sizeof(OldLastDir), LastDir
);
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)
@@
-908,8
+934,8
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
}
}
else if (buffy) {
}
}
else if (buffy) {
-
strfcpy (LastDir, state.entry[menu->current].name
,
- s
izeof (LastDir)
);
+
m_strcpy(LastDir, sizeof(LastDir)
,
+ s
tate.entry[menu->current].name
);
mutt_expand_path (LastDir, sizeof (LastDir));
}
#ifdef USE_IMAP
mutt_expand_path (LastDir, sizeof (LastDir));
}
#ifdef USE_IMAP
@@
-917,8
+943,8
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
int n;
ciss_url_t url;
int n;
ciss_url_t url;
-
strfcpy (LastDir, state.entry[menu->current].name
,
- s
izeof (LastDir)
);
+
m_strcpy(LastDir, sizeof(LastDir)
,
+ s
tate.entry[menu->current].name
);
/* tack on delimiter here */
n = m_strlen(LastDir) + 1;
/* tack on delimiter here */
n = m_strlen(LastDir) + 1;
@@
-937,7
+963,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
mutt_concat_path(tmp, sizeof(tmp), LastDir,
state.entry[menu->current].name);
mutt_concat_path(tmp, sizeof(tmp), LastDir,
state.entry[menu->current].name);
-
strfcpy (LastDir, tmp, sizeof (LastDir)
);
+
m_strcpy(LastDir, sizeof(LastDir), tmp
);
}
destroy_state (&state);
}
destroy_state (&state);
@@
-958,9
+984,9
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
#endif
if (examine_directory (menu, &state, LastDir, prefix) == -1) {
/* try to restore the old values */
#endif
if (examine_directory (menu, &state, LastDir, prefix) == -1) {
/* try to restore the old values */
-
strfcpy (LastDir, OldLastDir, sizeof (LastDir)
);
+
m_strcpy(LastDir, sizeof(LastDir), OldLastDir
);
if (examine_directory (menu, &state, LastDir, prefix) == -1) {
if (examine_directory (menu, &state, LastDir, prefix) == -1) {
-
strfcpy (LastDir, NONULL (Homedir), sizeof (LastD
ir));
+
m_strcpy(LastDir, sizeof(LastDir), NONULL(Homed
ir));
goto bail;
}
}
goto bail;
}
}
@@
-977,12
+1003,12
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
if (buffy)
#endif
{
if (buffy)
#endif
{
-
strfcpy (f, state.entry[menu->current].name, flen
);
+
m_strcpy(f, flen, state.entry[menu->current].name
);
mutt_expand_path (f, flen);
}
#ifdef USE_IMAP
else if (state.imap_browse)
mutt_expand_path (f, flen);
}
#ifdef USE_IMAP
else if (state.imap_browse)
-
strfcpy (f, state.entry[menu->current].name, flen
);
+
m_strcpy(f, flen, state.entry[menu->current].name
);
#endif
else
mutt_concat_path(f, flen, LastDir, state.entry[menu->current].name);
#endif
else
mutt_concat_path(f, flen, LastDir, state.entry[menu->current].name);
@@
-993,12
+1019,13
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
if (multiple) {
char **tfiles;
if (multiple) {
char **tfiles;
- int i, j;
+ int j;
+ unsigned int h;
if (menu->tagged) {
*numfiles = menu->tagged;
tfiles = p_new(char *, *numfiles);
if (menu->tagged) {
*numfiles = menu->tagged;
tfiles = p_new(char *, *numfiles);
- for (
i = 0, j = 0; i
< state.entrylen; i++) {
+ for (
h = 0, j = 0; h
< state.entrylen; i++) {
struct folder_file ff = state.entry[i];
char full[_POSIX_PATH_MAX];
struct folder_file ff = state.entry[i];
char full[_POSIX_PATH_MAX];
@@
-1122,13
+1149,13
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
break;
#endif
break;
#endif
-
strfcpy (buf, LastDir, sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), LastDir
);
#ifdef USE_IMAP
if (!state.imap_browse)
#endif
{
/* add '/' at the end of the directory name if not already there */
#ifdef USE_IMAP
if (!state.imap_browse)
#endif
{
/* add '/' at the end of the directory name if not already there */
-
in
t len = m_strlen(LastDir);
+
size_
t len = m_strlen(LastDir);
if (len && LastDir[len - 1] != '/' && sizeof (buf) > len)
buf[len] = '/';
if (len && LastDir[len - 1] != '/' && sizeof (buf) > len)
buf[len] = '/';
@@
-1140,7
+1167,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
mutt_expand_path (buf, sizeof (buf));
#ifdef USE_IMAP
if (imap_is_magic (buf, NULL) == M_IMAP) {
mutt_expand_path (buf, sizeof (buf));
#ifdef USE_IMAP
if (imap_is_magic (buf, NULL) == M_IMAP) {
-
strfcpy (LastDir, buf, sizeof (LastDir)
);
+
m_strcpy(LastDir, sizeof(LastDir), buf
);
destroy_state (&state);
init_state (&state, NULL);
state.imap_browse = 1;
destroy_state (&state);
init_state (&state, NULL);
state.imap_browse = 1;
@@
-1157,7
+1184,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
if (S_ISDIR (st.st_mode)) {
destroy_state (&state);
if (examine_directory (menu, &state, buf, prefix) == 0)
if (S_ISDIR (st.st_mode)) {
destroy_state (&state);
if (examine_directory (menu, &state, buf, prefix) == 0)
-
strfcpy (LastDir, buf, sizeof (LastDir)
);
+
m_strcpy(LastDir, sizeof(LastDir), buf
);
else {
mutt_error _("Error scanning directory.");
else {
mutt_error _("Error scanning directory.");
@@
-1181,7
+1208,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
case OP_ENTER_MASK:
case OP_ENTER_MASK:
-
strfcpy (buf, NONULL (Mask.pattern), sizeof (buf
));
+
m_strcpy(buf, sizeof(buf), NONULL(Mask.pattern
));
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;
@@
-1190,11
+1217,10
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
buffy = 0;
/* assume that the user wants to see everything */
if (!buf[0])
buffy = 0;
/* assume that the user wants to see everything */
if (!buf[0])
-
strfcpy (buf, ".", sizeof (buf)
);
-
SKIPWS
(s);
+
m_strcpy(buf, sizeof(buf), "."
);
+
s = vskipspaces
(s);
if (*s == '!') {
if (*s == '!') {
- s++;
- SKIPWS (s);
+ s = vskipspaces(s + 1);
not = 1;
}
not = 1;
}
@@
-1205,7
+1231,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
mutt_error ("%s", buf);
}
else {
mutt_error ("%s", buf);
}
else {
-
str_replace
(&Mask.pattern, buf);
+
m_strreplace
(&Mask.pattern, buf);
regfree (Mask.rx);
p_delete(&Mask.rx);
Mask.rx = rx;
regfree (Mask.rx);
p_delete(&Mask.rx);
Mask.rx = rx;
@@
-1322,7
+1348,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
snprintf (buf, sizeof (buf), "%s/", LastDir);
if (mutt_get_field (_("New file name: "), buf, sizeof (buf), M_FILE) ==
0) {
snprintf (buf, sizeof (buf), "%s/", LastDir);
if (mutt_get_field (_("New file name: "), buf, sizeof (buf), M_FILE) ==
0) {
-
strfcpy (f, buf, flen
);
+
m_strcpy(f, flen, buf
);
destroy_state (&state);
mutt_menuDestroy (&menu);
goto bail;
destroy_state (&state);
mutt_menuDestroy (&menu);
goto bail;
@@
-1339,7
+1365,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
#ifdef USE_IMAP
if (state.entry[menu->current].selectable) {
#ifdef USE_IMAP
if (state.entry[menu->current].selectable) {
-
strfcpy (f, state.entry[menu->current].name, flen
);
+
m_strcpy(f, flen, state.entry[menu->current].name
);
destroy_state (&state);
mutt_menuDestroy (&menu);
goto bail;
destroy_state (&state);
mutt_menuDestroy (&menu);
goto bail;
@@
-1355,11
+1381,11
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
}
else {
BODY *b;
}
else {
BODY *b;
- char buf[_POSIX_PATH_MAX];
+ char
n
buf[_POSIX_PATH_MAX];
- mutt_concat_path(
buf, sizeof(
buf), LastDir,
+ mutt_concat_path(
nbuf, sizeof(n
buf), LastDir,
state.entry[menu->current].name);
state.entry[menu->current].name);
- b = mutt_make_file_attach (buf);
+ b = mutt_make_file_attach (
n
buf);
if (b != NULL) {
mutt_view_attachment (NULL, b, M_REGULAR, NULL, NULL, 0);
mutt_free_body (&b);
if (b != NULL) {
mutt_view_attachment (NULL, b, M_REGULAR, NULL, NULL, 0);
mutt_free_body (&b);
@@
-1544,6
+1570,6
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
bail:
if (!folder)
bail:
if (!folder)
-
strfcpy (LastDir, LastDirBackup, sizeof (LastDir)
);
+
m_strcpy(LastDir, sizeof(LastDir), LastDirBackup
);
}
}