* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
+
+#include <dirent.h>
+#include <pwd.h>
+#include <grp.h>
-#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 <lib-ui/menu.h>
+#include <lib-ui/sidebar.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
-#include "enter.h"
-#include "mx.h"
-#include "mutt_curses.h"
-#include "mutt_menu.h"
#include "buffy.h"
#include "sort.h"
#include "browser.h"
#include "attach.h"
#include <imap/imap.h>
-#include <imap/mx_imap.h>
#ifdef USE_NNTP
-#include "nntp.h"
+#include <nntp/nntp.h>
#endif
-#include "sidebar.h"
-
-#include "lib/list.h"
-
-#include <stdlib.h>
-#include <dirent.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
static struct mapping_t FolderHelp[] = {
{N_("Exit"), OP_EXIT},
/* Frees up the memory allocated for the local-global variables. */
static void destroy_state (struct browser_state *state)
{
- unsigned int c;
+ 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, size_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, size_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);
{
#ifdef USE_NNTP
if (option (OPTNEWS)) {
- LIST *tmp;
+ string_list_t *tmp;
NNTP_DATA *data;
NNTP_SERVER *news = CurrentNewsSrv;
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 (CurrentMenu);
+ sidebar_draw ();
}
else
#endif /* USE_NNTP */
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);
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 ? Incoming.arr[i]->new : 0);
#else
- add_folder (menu, state, de->d_name, &s, i >= 0 ? ((BUFFY*) Incoming->data[i])->new : 0);
+ add_folder (menu, state, de->d_name, &s, i >= 0 ? Incoming.arr[i]->new : 0);
#endif
}
closedir (dp);
}
- sidebar_draw (CurrentMenu);
+ sidebar_draw ();
browser_sort (state);
return 0;
}
#ifdef USE_NNTP
if (option (OPTNEWS)) {
- LIST *tmp;
+ string_list_t *tmp;
NNTP_DATA *data;
NNTP_SERVER *news = CurrentNewsSrv;
(!option (OPTSHOWONLYUNREAD)|| data->unread))))
add_folder (menu, state, data->group, NULL, data, data->new);
}
- sidebar_draw (CurrentMenu);
+ sidebar_draw ();
}
else
#endif
{
- unsigned int i = 0;
+ int i = 0;
BUFFY* tmp;
- if (!Incoming)
+ if (!Incoming.len)
return (-1);
buffy_check (0);
init_state (state, menu);
- for (i = 0; i < Incoming->length; i++) {
- tmp = (BUFFY*) Incoming->data[i];
+ for (i = 0; i < Incoming.len; i++) {
+ tmp = Incoming.arr[i];
tmp->magic = mx_get_magic (tmp->path);
if (tmp->magic == M_IMAP) {
#ifdef USE_NNTP
(re, ((struct folder_file *) menu->data)[n].name, 0, NULL, 0));
}
-static void folder_entry (char *s, size_t slen, MUTTMENU * menu, int num)
+static void folder_entry (char *s, ssize_t slen, MUTTMENU * menu, int num)
{
FOLDER folder;
#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 *title, size_t titlelen, int buffy)
+ char *title, ssize_t titlelen, int buffy)
{
char path[_POSIX_PATH_MAX];
return ff->tagged - ot;
}
-void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
+void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
int *numfiles)
{
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;
if (*f)
m_strcpy(prefix, sizeof(prefix), f);
else {
- LIST *list;
+ string_list_t *list;
/* default state for news reader mode is browse subscribed newsgroups */
buffy = 0;
}
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), "/..");
}
}
}
url_parse_ciss (&url, state.entry[menu->current].name);
if (url.path &&
(state.entry[menu->current].delim != '\0') &&
- (n < sizeof (LastDir))) {
+ (n < ssizeof (LastDir))) {
LastDir[n] = '\0';
LastDir[n - 1] = state.entry[menu->current].delim;
}
/* 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 (multiple) {
char **tfiles;
int j;
- unsigned int h;
+ int h;
if (menu->tagged) {
*numfiles = menu->tagged;
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 (!state.imap_browse)
{
/* add '/' at the end of the directory name if not already there */
- size_t len = m_strlen(LastDir);
+ ssize_t len = m_strlen(LastDir);
- if (len && LastDir[len - 1] != '/' && sizeof (buf) > len)
+ if (len && LastDir[len - 1] != '/' && ssizeof(buf) > len)
buf[len] = '/';
}
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) {
b = mutt_make_file_attach (nbuf);
if (b != NULL) {
mutt_view_attachment (NULL, b, M_REGULAR, NULL, NULL, 0);
- mutt_free_body (&b);
+ body_list_wipe(&b);
menu->redraw = REDRAW_FULL;
}
else
case OP_CATCHUP:
case OP_UNCATCHUP:
if (option (OPTNEWS)) {
- struct folder_file *f = &state.entry[menu->current];
+ struct folder_file *folder_f = &state.entry[menu->current];
NNTP_DATA *nd;
if (i == OP_CATCHUP)
- nd = mutt_newsgroup_catchup (CurrentNewsSrv, f->name);
+ nd = mutt_newsgroup_catchup (CurrentNewsSrv, folder_f->name);
else
- nd = mutt_newsgroup_uncatchup (CurrentNewsSrv, f->name);
+ nd = mutt_newsgroup_uncatchup (CurrentNewsSrv, folder_f->name);
if (nd) {
-/* FOLDER folder;
- struct folder_file ff;
- char buffer[_POSIX_PATH_MAX + SHORT_STRING];
-
- folder.ff = &ff;
- folder.ff->name = f->name;
- folder.ff->st = NULL;
- folder.ff->is_new = nd->new;
- folder.ff->nd = nd;
- p_delete(&f->desc);
- mutt_FormatString (buffer, sizeof (buffer), NONULL(GroupFormat),
- newsgroup_format_str, (unsigned long) &folder,
- M_FORMAT_ARROWCURSOR);
- f->desc = m_strdup(buffer); */
if (menu->current + 1 < menu->max)
menu->current++;
menu->redraw = REDRAW_MOTION_RESYNCH;
break;
{
- LIST *tmp;
+ string_list_t *tmp;
NNTP_DATA *data;
for (tmp = CurrentNewsSrv->list; tmp; tmp = tmp->next) {
}
for (; j < state.entrylen; j++) {
- struct folder_file *f = &state.entry[j];
+ struct folder_file *folderf = &state.entry[j];
if (i == OP_BROWSER_SUBSCRIBE || i == OP_BROWSER_UNSUBSCRIBE ||
- regexec (rx, f->name, 0, NULL, 0) == 0) {
+ regexec (rx, folderf->name, 0, NULL, 0) == 0) {
if (i == OP_BROWSER_SUBSCRIBE || i == OP_SUBSCRIBE_PATTERN)
- nd = mutt_newsgroup_subscribe (news, f->name);
+ nd = mutt_newsgroup_subscribe (news, folderf->name);
else
- nd = mutt_newsgroup_unsubscribe (news, f->name);
-/* if (nd)
- {
- FOLDER folder;
- char buffer[_POSIX_PATH_MAX + SHORT_STRING];
-
- folder.name = f->name;
- folder.f = NULL;
- folder.new = nd->new;
- folder.nd = nd;
- p_delete(&f->desc);
- mutt_FormatString (buffer, sizeof (buffer), NONULL(GroupFormat),
- newsgroup_format_str, (unsigned long) &folder,
- M_FORMAT_ARROWCURSOR);
- f->desc = m_strdup(buffer);
- } */
+ nd = mutt_newsgroup_unsubscribe (news, folderf->name);
}
if (i == OP_BROWSER_SUBSCRIBE || i == OP_BROWSER_UNSUBSCRIBE) {
if (menu->current + 1 < menu->max)
}
}
if (i == OP_SUBSCRIBE_PATTERN) {
- LIST *grouplist = NULL;
+ string_list_t *grouplist = NULL;
if (news)
grouplist = news->list;
projects / apps / madmutt.git / blobdiff