X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=a9437dd0d68702eda99c2897dc05793599903912;hp=8bebbac430e5c63cb01af97fc40cddd82a56f9b5;hb=916e4872caf252a5850e64f79427b9dd7808435d;hpb=ecfcc6df70230ba136c2fb3843700ecb749c41b7 diff --git a/browser.c b/browser.c index 8bebbac..a9437dd 100644 --- a/browser.c +++ b/browser.c @@ -7,43 +7,28 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include -#include -#include -#include -#include -#include +#include +#include +#include #include #include +#include +#include +#include #include "mutt.h" -#include "mx.h" -#include "mutt_menu.h" #include "buffy.h" #include "sort.h" #include "browser.h" #include "attach.h" #include -#include #ifdef USE_NNTP -#include "nntp.h" +#include #endif -#include "sidebar.h" - -#include "lib/list.h" - -#include -#include -#include -#include -#include -#include -#include static struct mapping_t FolderHelp[] = { {N_("Exit"), OP_EXIT}, @@ -77,7 +62,7 @@ static char LastDirBackup[_POSIX_PATH_MAX] = ""; /* 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)); @@ -160,7 +145,7 @@ static int link_is_dir (const char *folder, const char *path) 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, @@ -324,7 +309,7 @@ static const char *folder_format_str (char *dest, size_t destlen, char op, } #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, @@ -466,7 +451,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state, { #ifdef USE_NNTP if (option (OPTNEWS)) { - LIST *tmp; + string_list_t *tmp; NNTP_DATA *data; NNTP_SERVER *news = CurrentNewsSrv; @@ -488,7 +473,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state, add_folder (menu, state, data->group, NULL, data->new); #endif } - sidebar_draw (CurrentMenu); + sidebar_draw (); } else #endif /* USE_NNTP */ @@ -547,14 +532,14 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state, 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; } @@ -567,7 +552,7 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state) #ifdef USE_NNTP if (option (OPTNEWS)) { - LIST *tmp; + string_list_t *tmp; NNTP_DATA *data; NNTP_SERVER *news = CurrentNewsSrv; @@ -582,22 +567,22 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state) (!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 @@ -653,7 +638,7 @@ static int select_file_search (MUTTMENU * menu, regex_t * re, int n) (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; @@ -671,7 +656,7 @@ static void folder_entry (char *s, size_t slen, MUTTMENU * menu, int num) } 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]; @@ -729,7 +714,7 @@ static int file_tag (MUTTMENU * menu, int n, int m) 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]; @@ -756,7 +741,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, 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; @@ -918,7 +903,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, 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; } @@ -981,7 +966,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, if (multiple) { char **tfiles; int j; - unsigned int h; + int h; if (menu->tagged) { *numfiles = menu->tagged; @@ -1112,9 +1097,9 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, 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] = '/'; } @@ -1337,7 +1322,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, 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 @@ -1349,29 +1334,15 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, 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; @@ -1384,7 +1355,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, break; { - LIST *tmp; + string_list_t *tmp; NNTP_DATA *data; for (tmp = CurrentNewsSrv->list; tmp; tmp = tmp->next) { @@ -1446,29 +1417,14 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, } 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) @@ -1478,7 +1434,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, } } if (i == OP_SUBSCRIBE_PATTERN) { - LIST *grouplist = NULL; + string_list_t *grouplist = NULL; if (news) grouplist = news->list;