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);
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[SHORT_STRING], tmp[SHORT_STRING], permission[11], date[16];
+ char fn[STRING], tmp[STRING], permission[11], date[16];
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);
const char *s;
if (folder->ff->imap)
- s = NONULL (folder->ff->desc);
+ s = NONULL(folder->ff->desc);
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) ? "@" :
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) !=
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
-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[SHORT_STRING], tmp[SHORT_STRING];
- FOLDER *folder = (FOLDER *) data;
+ char fn[STRING], tmp[STRING];
+ FOLDER *folder = data.ptr;
switch (op) {
case 'C':
case 's':
if (flags & M_FORMAT_OPTIONAL) {
if (folder->ff->nd->unread != 0)
- mutt_FormatString (dest, destlen, ifstring, newsgroup_format_str,
- data, flags);
+ m_strformat(dest, destlen, 0, ifstr, newsgroup_format_str,
+ data, flags);
else
- mutt_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);
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))
+ if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.neg))
continue;
-#ifdef USE_NNTP
add_folder (menu, state, data->group, NULL, data, data->new);
-#else
- add_folder (menu, state, data->group, NULL, data->new);
-#endif
}
sidebar_draw ();
}
struct stat s;
DIR *dp;
struct dirent *de;
- char buffer[_POSIX_PATH_MAX + SHORT_STRING];
+ char buffer[_POSIX_PATH_MAX + STRING];
int i = -1;
while (stat (d, &s) == -1) {
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))
+ if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.neg))
continue;
mutt_concat_path(buffer, sizeof(buffer), d, de->d_name);
#ifdef USE_NNTP
if (option (OPTNEWS))
- mutt_FormatString (s, slen, NONULL (GroupFormat), newsgroup_format_str,
- (unsigned long) &folder, M_FORMAT_ARROWCURSOR);
+ m_strformat(s, slen, COLS - SW, GroupFormat, newsgroup_format_str,
+ &folder, 0);
else
#endif
- mutt_FormatString (s, slen, NONULL (FolderFormat), folder_format_str,
- (unsigned long) &folder, M_FORMAT_ARROWCURSOR);
+ m_strformat(s, slen, COLS - SW, FolderFormat, folder_format_str,
+ &folder, 0);
}
static void init_menu (struct browser_state *state, MUTTMENU * menu,
{
char buf[_POSIX_PATH_MAX];
char prefix[_POSIX_PATH_MAX] = "";
- char helpstr[SHORT_STRING];
+ char helpstr[STRING];
char title[STRING];
struct browser_state state;
MUTTMENU *menu;
}
else {
if (f[0] == '/')
- strcpy (LastDir, "/"); /* __STRCPY_CHECKED__ */
+ m_strcpy(LastDir, sizeof(LastDir), "/");
else
getcwd (LastDir, sizeof (LastDir));
}
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, '/');
if (LastDir[0] == '/')
LastDir[1] = 0;
else
- strcat (LastDir, "/.."); /* __STRCAT_CHECKED__ */
+ m_strcat(LastDir, sizeof(LastDir), "/..");
}
}
}
/* 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(Homedir));
+ m_strcpy(LastDir, sizeof(LastDir), NONULL(mod_core.homedir));
goto bail;
}
}
if (!state.entry[menu->current].imap)
mutt_error (_("Delete is only supported for IMAP mailboxes"));
else {
- char msg[SHORT_STRING];
+ char msg[STRING];
IMAP_MBOX mx;
int nentry = menu->current;
if (mutt_get_field (_("File Mask: "), buf, sizeof (buf), 0) == 0) {
regex_t *rx = p_new(regex_t, 1);
char *s = buf;
- int not = 0, err;
+ int neg = 0, err;
buffy = 0;
/* assume that the user wants to see everything */
s = vskipspaces(s);
if (*s == '!') {
s = vskipspaces(s + 1);
- not = 1;
+ neg = 1;
}
if ((err = REGCOMP (rx, s, REG_NOSUB)) != 0) {
regfree (Mask.rx);
p_delete(&Mask.rx);
Mask.rx = rx;
- Mask.not = not;
+ Mask.neg = neg;
destroy_state (&state);
if (state.imap_browse) {