projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no more SHORT_STRING's. begin some doc.
[apps/madmutt.git]
/
browser.c
diff --git
a/browser.c
b/browser.c
index
c6207c7
..
43b1b34
100644
(file)
--- a/
browser.c
+++ b/
browser.c
@@
-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[] = {
@@
-462,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;
@@
-516,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;
@@
-780,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));
}
@@
-871,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, '/');
@@
-881,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), "/..");
}
}
}
}
}
}