# include "config.h"
#endif
+#include <stdlib.h>
+#include <dirent.h>
+#include <string.h>
+#include <ctype.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <pwd.h>
+#include <grp.h>
+
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
#include "mx.h"
-#include "mutt_menu.h"
#include "buffy.h"
#include "sort.h"
#include "browser.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},
{N_("Chdir"), OP_CHANGE_DIRECTORY},
/* 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));
return 0;
}
-static const char *folder_format_str (char *dest, size_t destlen, char op,
+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,
}
#ifdef USE_NNTP
-static const char *newsgroup_format_str (char *dest, size_t destlen, char op,
+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,
{
#ifdef USE_NNTP
if (option (OPTNEWS)) {
- LIST *tmp;
+ string_list_t *tmp;
NNTP_DATA *data;
NNTP_SERVER *news = CurrentNewsSrv;
#ifdef USE_NNTP
if (option (OPTNEWS)) {
- LIST *tmp;
+ string_list_t *tmp;
NNTP_DATA *data;
NNTP_SERVER *news = CurrentNewsSrv;
else
#endif
{
- unsigned int i = 0;
+ int i = 0;
BUFFY* tmp;
if (!Incoming)
(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;
}
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];
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;
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;
}
if (multiple) {
char **tfiles;
int j;
- unsigned int h;
+ int h;
if (menu->tagged) {
*numfiles = menu->tagged;
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] = '/';
}
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;