projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move the last crypt-* things into lib-crypt, adapt configure.ac
[apps/madmutt.git]
/
browser.c
diff --git
a/browser.c
b/browser.c
index
6a9e6ec
..
8bebbac
100644
(file)
--- a/
browser.c
+++ b/
browser.c
@@
-12,29
+12,29
@@
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+#include <lib-lib/mapping.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
#include "mutt.h"
#include "mutt.h"
-#include "enter.h"
#include "mx.h"
#include "mx.h"
-#include "mutt_curses.h"
#include "mutt_menu.h"
#include "buffy.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"
-#ifdef USE_IMAP
-#include "imap.h"
-#include "imap/mx_imap.h"
-#endif
+#include <imap/imap.h>
+#include <imap/mx_imap.h>
#ifdef USE_NNTP
#include "nntp.h"
#endif
#include "sidebar.h"
#ifdef USE_NNTP
#include "nntp.h"
#endif
#include "sidebar.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/list.h"
#include <stdlib.h>
#include "lib/list.h"
#include <stdlib.h>
@@
-77,16
+77,14
@@
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));
p_delete(&((state->entry)[c].desc));
p_delete(&((state->entry)[c].st));
}
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));
}
-#ifdef USE_IMAP
p_delete(&state->folder);
p_delete(&state->folder);
-#endif
p_delete(&state->entry);
}
p_delete(&state->entry);
}
@@
-95,7
+93,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);
}
@@
-154,7
+152,7
@@
static int link_is_dir (const char *folder, const char *path)
struct stat st;
char fullpath[_POSIX_PATH_MAX];
struct stat st;
char fullpath[_POSIX_PATH_MAX];
- mutt_concat_path
(fullpath, folder, path, sizeof (fullpath)
);
+ mutt_concat_path
(fullpath, sizeof(fullpath), folder, path
);
if (stat (fullpath, &st) == 0)
return (S_ISDIR (st.st_mode));
if (stat (fullpath, &st) == 0)
return (S_ISDIR (st.st_mode));
@@
-200,11
+198,9
@@
static const char *folder_format_str (char *dest, size_t destlen, char op,
{
const char *s;
{
const char *s;
-#ifdef USE_IMAP
if (folder->ff->imap)
s = NONULL (folder->ff->desc);
else
if (folder->ff->imap)
s = NONULL (folder->ff->desc);
else
-#endif
s = NONULL (folder->ff->name);
snprintf (fn, sizeof (fn), "%s%s", s,
s = NONULL (folder->ff->name);
snprintf (fn, sizeof (fn), "%s%s", s,
@@
-239,7
+235,6
@@
static const char *folder_format_str (char *dest, size_t destlen, char op,
0 ? 'x' : '-');
mutt_format_s (dest, destlen, fmt, permission);
}
0 ? 'x' : '-');
mutt_format_s (dest, destlen, fmt, permission);
}
-#ifdef USE_IMAP
else if (folder->ff->imap) {
/* mark folders with subfolders AND mail */
snprintf (permission, sizeof (permission), "IMAP %c",
else if (folder->ff->imap) {
/* mark folders with subfolders AND mail */
snprintf (permission, sizeof (permission), "IMAP %c",
@@
-247,7
+242,6
@@
static const char *folder_format_str (char *dest, size_t destlen, char op,
&& folder->ff->selectable) ? '+' : ' ');
mutt_format_s (dest, destlen, fmt, permission);
}
&& folder->ff->selectable) ? '+' : ' ');
mutt_format_s (dest, destlen, fmt, permission);
}
-#endif
else
mutt_format_s (dest, destlen, fmt, "");
break;
else
mutt_format_s (dest, destlen, fmt, "");
break;
@@
-275,7
+269,6
@@
static const char *folder_format_str (char *dest, size_t destlen, char op,
break;
case 'N':
break;
case 'N':
-#ifdef USE_IMAP
if (imap_is_magic (folder->ff->desc, NULL) == M_IMAP) {
if (!optional) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
if (imap_is_magic (folder->ff->desc, NULL) == M_IMAP) {
if (!optional) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
@@
-285,7
+278,6
@@
static const char *folder_format_str (char *dest, size_t destlen, char op,
optional = 0;
break;
}
optional = 0;
break;
}
-#endif
snprintf (tmp, sizeof (tmp), "%%%sc", fmt);
snprintf (dest, destlen, tmp, folder->ff->new ? 'N' : ' ');
break;
snprintf (tmp, sizeof (tmp), "%%%sc", fmt);
snprintf (dest, destlen, tmp, folder->ff->new ? 'N' : ' ');
break;
@@
-349,7
+341,7
@@
static const char *newsgroup_format_str (char *dest, size_t destlen, char op,
break;
case 'f':
break;
case 'f':
-
strncpy (fn, folder->ff->name, sizeof (fn) - 1
);
+
m_strcpy(fn, sizeof(fn), folder->ff->name
);
snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
snprintf (dest, destlen, tmp, fn);
break;
snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
snprintf (dest, destlen, tmp, fn);
break;
@@
-422,9
+414,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 */
@@
-442,11
+440,9
@@
static void add_folder (MUTTMENU * m, struct browser_state *state,
}
(state->entry)[state->entrylen].new = new;
}
(state->entry)[state->entrylen].new = new;
- (state->entry)[state->entrylen].name = str_dup (name);
- (state->entry)[state->entrylen].desc = str_dup (name);
-#ifdef USE_IMAP
+ (state->entry)[state->entrylen].name = m_strdup(name);
+ (state->entry)[state->entrylen].desc = m_strdup(name);
(state->entry)[state->entrylen].imap = 0;
(state->entry)[state->entrylen].imap = 0;
-#endif
#ifdef USE_NNTP
if (option (OPTNEWS))
(state->entry)[state->entrylen].nd = (NNTP_DATA *) data;
#ifdef USE_NNTP
if (option (OPTNEWS))
(state->entry)[state->entrylen].nd = (NNTP_DATA *) data;
@@
-459,9
+455,7
@@
static void init_state (struct browser_state *state, MUTTMENU * menu)
state->entrylen = 0;
state->entrymax = 256;
state->entry = p_new(struct folder_file, state->entrymax);
state->entrylen = 0;
state->entrymax = 256;
state->entry = p_new(struct folder_file, state->entrymax);
-#ifdef USE_IMAP
state->imap_browse = 0;
state->imap_browse = 0;
-#endif
if (menu)
menu->data = state->entry;
}
if (menu)
menu->data = state->entry;
}
@@
-484,11
+478,15
@@
static int examine_directory (MUTTMENU * menu, struct browser_state *state,
continue;
nntp_sync_sidebar (data);
if (prefix && *prefix && strncmp (prefix, data->group,
continue;
nntp_sync_sidebar (data);
if (prefix && *prefix && strncmp (prefix, data->group,
-
str_len
(prefix)) != 0)
+
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;
+#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);
}
@@
-530,16
+528,16
@@
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 (
str_cmp
(de->d_name, ".") == 0)
+ if (
m_strcmp
(de->d_name, ".") == 0)
continue; /* we don't need . */
if (prefix && *prefix
continue; /* we don't need . */
if (prefix && *prefix
- &&
str_ncmp (prefix, de->d_name, str_len
(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;
- mutt_concat_path
(buffer, d, de->d_name, sizeof (buffer)
);
+ mutt_concat_path
(buffer, sizeof(buffer), d, de->d_name
);
if (lstat (buffer, &s) == -1)
continue;
if (lstat (buffer, &s) == -1)
continue;
@@
-548,7
+546,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);
}
@@
-585,7
+587,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)
@@
-597,18
+599,22
@@
static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state)
for (i = 0; i < Incoming->length; i++) {
tmp = (BUFFY*) Incoming->data[i];
tmp->magic = mx_get_magic (tmp->path);
for (i = 0; i < Incoming->length; i++) {
tmp = (BUFFY*) Incoming->data[i];
tmp->magic = mx_get_magic (tmp->path);
-#ifdef USE_IMAP
if (tmp->magic == M_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;
}
continue;
}
-#endif
-#ifdef USE_POP
if (tmp->magic == M_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;
}
continue;
}
-#endif
#ifdef USE_NNTP
if (tmp->magic == M_NNTP) {
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
#ifdef USE_NNTP
if (tmp->magic == M_NNTP) {
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
@@
-622,10
+628,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);
@@
-687,16
+697,14
@@
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);
mutt_pretty_mailbox (path);
-#ifdef USE_IMAP
if (state->imap_browse && option (OPTIMAPLSUB))
snprintf (title, titlelen, _("Subscribed [%s], File mask: %s"),
path, NONULL (Mask.pattern));
else
if (state->imap_browse && option (OPTIMAPLSUB))
snprintf (title, titlelen, _("Subscribed [%s], File mask: %s"),
path, NONULL (Mask.pattern));
else
-#endif
snprintf (title, titlelen, _("Directory [%s], File mask: %s"),
path, NONULL (Mask.pattern));
}
snprintf (title, titlelen, _("Directory [%s], File mask: %s"),
path, NONULL (Mask.pattern));
}
@@
-738,15
+746,15
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
buffy = buffy && folder;
buffy = buffy && folder;
-
memset (&state, 0, sizeof (struct browser_state)
);
+
p_clear(&state, 1
);
if (!folder)
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;
@@
-766,27
+774,23
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
#endif
if (*f) {
mutt_expand_path (f, flen);
#endif
if (*f) {
mutt_expand_path (f, flen);
-#ifdef USE_IMAP
if (imap_is_magic (f, NULL) == M_IMAP) {
init_state (&state, NULL);
state.imap_browse = 1;
if (!imap_browse (f, &state))
if (imap_is_magic (f, NULL) == M_IMAP) {
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 {
}
else {
-#endif
- for (i = str_len (f) - 1; i > 0 && f[i] != '/'; i--);
+ for (i = m_strlen(f) - 1; i > 0 && f[i] != '/'; i--);
if (i > 0) {
if (f[0] == '/') {
if (i > 0) {
if (f[0] == '/') {
- if (i > sizeof (LastDir) - 1)
- i = sizeof (LastDir) - 1;
- strncpy (LastDir, f, i);
- LastDir[i] = 0;
+ i = MIN(ssizeof(LastDir) - 1, i);
+ m_strcpy(LastDir, sizeof(LastDir), f);
}
else {
}
else {
- getcwd
(LastDir, sizeof
(LastDir));
-
str_cat (LastDir, sizeof
(LastDir), "/");
-
str_ncat (LastDir, sizeof
(LastDir), f, i);
+ getcwd
(LastDir, sizeof
(LastDir));
+
m_strcat(LastDir, sizeof
(LastDir), "/");
+
m_strncat(LastDir, sizeof
(LastDir), f, i);
}
}
else {
}
}
else {
@@
-797,28
+801,24
@@
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;
killPrefix = 1;
-#ifdef USE_IMAP
}
}
-#endif
}
else {
if (!folder)
getcwd (LastDir, sizeof (LastDir));
else if (!LastDir[0])
}
else {
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) {
init_state (&state, NULL);
state.imap_browse = 1;
imap_browse (LastDir, &state);
browser_sort (&state);
}
if (!buffy && imap_is_magic (LastDir, NULL) == M_IMAP) {
init_state (&state, NULL);
state.imap_browse = 1;
imap_browse (LastDir, &state);
browser_sort (&state);
}
-#endif
}
*f = 0;
}
*f = 0;
@@
-828,9
+828,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
goto bail;
}
else
goto bail;
}
else
-#ifdef USE_IMAP
if (!state.imap_browse)
if (!state.imap_browse)
-#endif
if (examine_directory (NULL, &state, LastDir, prefix) == -1)
goto bail;
if (examine_directory (NULL, &state, LastDir, prefix) == -1)
goto bail;
@@
-851,7
+849,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
init_menu (&state, menu, title, sizeof (title), buffy);
init_menu (&state, menu, title, sizeof (title), buffy);
-
FOREVER
{
+
for (;;)
{
switch (i = mutt_menuLoop (menu)) {
case OP_GENERIC_SELECT_ENTRY:
switch (i = mutt_menuLoop (menu)) {
case OP_GENERIC_SELECT_ENTRY:
@@
-864,36
+862,30
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
if (S_ISDIR (state.entry[menu->current].mode) ||
(S_ISLNK (state.entry[menu->current].mode) &&
link_is_dir (LastDir, state.entry[menu->current].name))
if (S_ISDIR (state.entry[menu->current].mode) ||
(S_ISLNK (state.entry[menu->current].mode) &&
link_is_dir (LastDir, state.entry[menu->current].name))
-#ifdef USE_IMAP
|| state.entry[menu->current].inferiors
|| state.entry[menu->current].inferiors
-#endif
) {
/* 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));
}
mutt_expand_path (buf, sizeof (buf));
}
-#ifdef USE_IMAP
else if (state.imap_browse) {
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
else
- mutt_concat_path
(buf, LastDir, state.entry[menu->current].name
,
-
sizeof (buf)
);
+ mutt_concat_path
(buf, sizeof(buf), LastDir
,
+
state.entry[menu->current].name
);
if ((mx_get_magic (buf) <= 0)
if ((mx_get_magic (buf) <= 0)
-#ifdef USE_IMAP
- || state.entry[menu->current].inferiors
-#endif
- ) {
+ || state.entry[menu->current].inferiors)
+ {
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 (
str_cmp
(state.entry[menu->current].name, "..") == 0) {
- if (
str_cmp ("..", LastDir + str_len
(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__ */
else {
char *p = strrchr (LastDir + 1, '/');
strcat (LastDir, "/.."); /* __STRCAT_CHECKED__ */
else {
char *p = strrchr (LastDir + 1, '/');
@@
-909,19
+901,18
@@
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));
}
mutt_expand_path (LastDir, sizeof (LastDir));
}
-#ifdef USE_IMAP
else if (state.imap_browse) {
int n;
ciss_url_t url;
else if (state.imap_browse) {
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 */
/* tack on delimiter here */
- n =
str_len
(LastDir) + 1;
+ n =
m_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);
@@
-932,13
+923,12
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
LastDir[n - 1] = state.entry[menu->current].delim;
}
}
LastDir[n - 1] = state.entry[menu->current].delim;
}
}
-#endif
else {
char tmp[_POSIX_PATH_MAX];
else {
char tmp[_POSIX_PATH_MAX];
- mutt_concat_path
(tmp, LastDir, state.entry[menu->current].name
,
-
sizeof (tmp)
);
-
strfcpy (LastDir, tmp, sizeof (LastDir)
);
+ mutt_concat_path
(tmp, sizeof(tmp), LastDir
,
+
state.entry[menu->current].name
);
+
m_strcpy(LastDir, sizeof(LastDir), tmp
);
}
destroy_state (&state);
}
destroy_state (&state);
@@
-947,7
+937,6
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
killPrefix = 0;
}
buffy = 0;
killPrefix = 0;
}
buffy = 0;
-#ifdef USE_IMAP
if (state.imap_browse) {
init_state (&state, NULL);
state.imap_browse = 1;
if (state.imap_browse) {
init_state (&state, NULL);
state.imap_browse = 1;
@@
-956,12
+945,11
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
menu->data = state.entry;
}
else
menu->data = state.entry;
}
else
-#endif
if (examine_directory (menu, &state, LastDir, prefix) == -1) {
/* try to restore the old values */
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;
}
}
@@
-978,15
+966,13
@@
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);
}
mutt_expand_path (f, flen);
}
-#ifdef USE_IMAP
else if (state.imap_browse)
else if (state.imap_browse)
- strfcpy (f, state.entry[menu->current].name, flen);
-#endif
+ m_strcpy(f, flen, state.entry[menu->current].name);
else
else
- mutt_concat_path
(f, LastDir, state.entry[menu->current].name, flen
);
+ mutt_concat_path
(f, flen, LastDir, state.entry[menu->current].name
);
/* Fall through to OP_EXIT */
/* Fall through to OP_EXIT */
@@
-994,19
+980,20
@@
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];
if (ff.tagged) {
struct folder_file ff = state.entry[i];
char full[_POSIX_PATH_MAX];
if (ff.tagged) {
- mutt_concat_path
(full, LastDir, ff.name, sizeof (full)
);
+ mutt_concat_path
(full, sizeof(full), LastDir, ff.name
);
mutt_expand_path (full, sizeof (full));
mutt_expand_path (full, sizeof (full));
- tfiles[j++] =
str_dup
(full);
+ tfiles[j++] =
m_strdup
(full);
}
}
*files = tfiles;
}
}
*files = tfiles;
@@
-1015,7
+1002,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
*numfiles = 1;
tfiles = p_new(char *, *numfiles);
mutt_expand_path (f, flen);
*numfiles = 1;
tfiles = p_new(char *, *numfiles);
mutt_expand_path (f, flen);
- tfiles[0] =
str_dup
(f);
+ tfiles[0] =
m_strdup
(f);
*files = tfiles;
}
}
*files = tfiles;
}
}
@@
-1029,7
+1016,6
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
mutt_message ("%s", state.entry[menu->current].name);
break;
mutt_message ("%s", state.entry[menu->current].name);
break;
-#ifdef USE_IMAP
case OP_BROWSER_TOGGLE_LSUB:
if (option (OPTIMAPLSUB)) {
unset_option (OPTIMAPLSUB);
case OP_BROWSER_TOGGLE_LSUB:
if (option (OPTIMAPLSUB)) {
unset_option (OPTIMAPLSUB);
@@
-1114,7
+1100,6
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
p_delete(&mx.mbox);
}
break;
p_delete(&mx.mbox);
}
break;
-#endif
case OP_CHANGE_DIRECTORY:
case OP_CHANGE_DIRECTORY:
@@
-1123,13
+1108,11
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
break;
#endif
break;
#endif
- strfcpy (buf, LastDir, sizeof (buf));
-#ifdef USE_IMAP
+ m_strcpy(buf, sizeof(buf), LastDir);
if (!state.imap_browse)
if (!state.imap_browse)
-#endif
{
/* add '/' at the end of the directory name if not already there */
{
/* add '/' at the end of the directory name if not already there */
-
int len = str_len
(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] = '/';
@@
-1139,9
+1122,8
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
buf[0]) {
buffy = 0;
mutt_expand_path (buf, sizeof (buf));
buf[0]) {
buffy = 0;
mutt_expand_path (buf, sizeof (buf));
-#ifdef USE_IMAP
if (imap_is_magic (buf, NULL) == M_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;
@@
-1153,12
+1135,11
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
init_menu (&state, menu, title, sizeof (title), buffy);
}
else
init_menu (&state, menu, title, sizeof (title), buffy);
}
else
-#endif
if (stat (buf, &st) == 0) {
if (S_ISDIR (st.st_mode)) {
destroy_state (&state);
if (examine_directory (menu, &state, buf, prefix) == 0)
if (stat (buf, &st) == 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.");
@@
-1182,7
+1163,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;
@@
-1191,11
+1172,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;
}
@@
-1206,14
+1186,13
@@
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;
Mask.not = not;
destroy_state (&state);
regfree (Mask.rx);
p_delete(&Mask.rx);
Mask.rx = rx;
Mask.not = not;
destroy_state (&state);
-#ifdef USE_IMAP
if (state.imap_browse) {
init_state (&state, NULL);
state.imap_browse = 1;
if (state.imap_browse) {
init_state (&state, NULL);
state.imap_browse = 1;
@@
-1223,7
+1202,6
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
init_menu (&state, menu, title, sizeof (title), buffy);
}
else
init_menu (&state, menu, title, sizeof (title), buffy);
}
else
-#endif
if (examine_directory (menu, &state, LastDir, NULL) == 0)
init_menu (&state, menu, title, sizeof (title), buffy);
else {
if (examine_directory (menu, &state, LastDir, NULL) == 0)
init_menu (&state, menu, title, sizeof (title), buffy);
else {
@@
-1298,7
+1276,6
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
if (examine_mailboxes (menu, &state) == -1)
goto bail;
}
if (examine_mailboxes (menu, &state) == -1)
goto bail;
}
-#ifdef USE_IMAP
else if (imap_is_magic (LastDir, NULL) == M_IMAP) {
init_state (&state, NULL);
state.imap_browse = 1;
else if (imap_is_magic (LastDir, NULL) == M_IMAP) {
init_state (&state, NULL);
state.imap_browse = 1;
@@
-1306,7
+1283,6
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
browser_sort (&state);
menu->data = state.entry;
}
browser_sort (&state);
menu->data = state.entry;
}
-#endif
else if (examine_directory (menu, &state, LastDir, prefix) == -1)
goto bail;
init_menu (&state, menu, title, sizeof (title), buffy);
else if (examine_directory (menu, &state, LastDir, prefix) == -1)
goto bail;
init_menu (&state, menu, title, sizeof (title), buffy);
@@
-1323,7
+1299,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;
@@
-1338,15
+1314,13
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
break;
}
break;
}
-#ifdef USE_IMAP
if (state.entry[menu->current].selectable) {
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;
}
else
destroy_state (&state);
mutt_menuDestroy (&menu);
goto bail;
}
else
-#endif
if (S_ISDIR (state.entry[menu->current].mode) ||
(S_ISLNK (state.entry[menu->current].mode) &&
link_is_dir (LastDir, state.entry[menu->current].name))) {
if (S_ISDIR (state.entry[menu->current].mode) ||
(S_ISLNK (state.entry[menu->current].mode) &&
link_is_dir (LastDir, state.entry[menu->current].name))) {
@@
-1356,11
+1330,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, LastDir, state.entry[menu->current].name
,
-
sizeof (buf)
);
- b = mutt_make_file_attach (buf);
+ mutt_concat_path
(nbuf, sizeof(nbuf), LastDir
,
+
state.entry[menu->current].name
);
+ 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);
@@
-1397,7
+1371,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
mutt_FormatString (buffer, sizeof (buffer), NONULL(GroupFormat),
newsgroup_format_str, (unsigned long) &folder,
M_FORMAT_ARROWCURSOR);
mutt_FormatString (buffer, sizeof (buffer), NONULL(GroupFormat),
newsgroup_format_str, (unsigned long) &folder,
M_FORMAT_ARROWCURSOR);
- f->desc =
str_dup
(buffer); */
+ f->desc =
m_strdup
(buffer); */
if (menu->current + 1 < menu->max)
menu->current++;
menu->redraw = REDRAW_MOTION_RESYNCH;
if (menu->current + 1 < menu->max)
menu->current++;
menu->redraw = REDRAW_MOTION_RESYNCH;
@@
-1429,10
+1403,8
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
break;
#endif /* USE_NNTP */
break;
#endif /* USE_NNTP */
-#if defined USE_IMAP || defined USE_NNTP
case OP_BROWSER_SUBSCRIBE:
case OP_BROWSER_UNSUBSCRIBE:
case OP_BROWSER_SUBSCRIBE:
case OP_BROWSER_UNSUBSCRIBE:
-#endif
#ifdef USE_NNTP
case OP_SUBSCRIBE_PATTERN:
case OP_UNSUBSCRIBE_PATTERN:
#ifdef USE_NNTP
case OP_SUBSCRIBE_PATTERN:
case OP_UNSUBSCRIBE_PATTERN:
@@
-1495,7
+1467,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
mutt_FormatString (buffer, sizeof (buffer), NONULL(GroupFormat),
newsgroup_format_str, (unsigned long) &folder,
M_FORMAT_ARROWCURSOR);
mutt_FormatString (buffer, sizeof (buffer), NONULL(GroupFormat),
newsgroup_format_str, (unsigned long) &folder,
M_FORMAT_ARROWCURSOR);
- f->desc =
str_dup
(buffer);
+ f->desc =
m_strdup
(buffer);
} */
}
if (i == OP_BROWSER_SUBSCRIBE || i == OP_BROWSER_UNSUBSCRIBE) {
} */
}
if (i == OP_BROWSER_SUBSCRIBE || i == OP_BROWSER_UNSUBSCRIBE) {
@@
-1527,24
+1499,20
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
regfree (rx);
p_delete(&rx);
}
regfree (rx);
p_delete(&rx);
}
-#ifdef USE_IMAP
else
else
-#endif /* USE_IMAP && USE_NNTP */
#endif /* USE_NNTP */
#endif /* USE_NNTP */
-#ifdef USE_IMAP
{
if (i == OP_BROWSER_SUBSCRIBE)
imap_subscribe (state.entry[menu->current].name, 1);
else
imap_subscribe (state.entry[menu->current].name, 0);
}
{
if (i == OP_BROWSER_SUBSCRIBE)
imap_subscribe (state.entry[menu->current].name, 1);
else
imap_subscribe (state.entry[menu->current].name, 0);
}
-#endif /* USE_IMAP */
}
}
bail:
if (!folder)
}
}
bail:
if (!folder)
-
strfcpy (LastDir, LastDirBackup, sizeof (LastDir)
);
+
m_strcpy(LastDir, sizeof(LastDir), LastDirBackup
);
}
}