projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compilation warnings
[apps/madmutt.git]
/
browser.c
diff --git
a/browser.c
b/browser.c
index
a9437dd
..
fd92753
100644
(file)
--- a/
browser.c
+++ b/
browser.c
@@
-151,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;
@@
-316,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) {
@@
-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;
@@
-481,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) {
@@
-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;
@@
-719,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;
@@
-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), "/..");
}
}
}
}
}
}
@@
-1056,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;