X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=a9437dd0d68702eda99c2897dc05793599903912;hp=0e300003d8ff9df512d0705197ded47ce33290c4;hb=916e4872caf252a5850e64f79427b9dd7808435d;hpb=0ac011f8eb41bab7808881ebf9802b4eb252fe3b diff --git a/browser.c b/browser.c index 0e30000..a9437dd 100644 --- a/browser.c +++ b/browser.c @@ -7,44 +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 "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" -#ifdef USE_IMAP -#include "imap.h" -#include "imap/mx_imap.h" -#endif +#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}, @@ -78,16 +62,14 @@ 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)); p_delete(&((state->entry)[c].desc)); p_delete(&((state->entry)[c].st)); } -#ifdef USE_IMAP p_delete(&state->folder); -#endif p_delete(&state->entry); } @@ -163,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, @@ -201,11 +183,9 @@ static const char *folder_format_str (char *dest, size_t destlen, char op, { const char *s; -#ifdef USE_IMAP if (folder->ff->imap) s = NONULL (folder->ff->desc); else -#endif s = NONULL (folder->ff->name); snprintf (fn, sizeof (fn), "%s%s", s, @@ -240,7 +220,6 @@ static const char *folder_format_str (char *dest, size_t destlen, char op, 0 ? 'x' : '-'); mutt_format_s (dest, destlen, fmt, permission); } -#ifdef USE_IMAP else if (folder->ff->imap) { /* mark folders with subfolders AND mail */ snprintf (permission, sizeof (permission), "IMAP %c", @@ -248,7 +227,6 @@ static const char *folder_format_str (char *dest, size_t destlen, char op, && folder->ff->selectable) ? '+' : ' '); mutt_format_s (dest, destlen, fmt, permission); } -#endif else mutt_format_s (dest, destlen, fmt, ""); break; @@ -276,7 +254,6 @@ static const char *folder_format_str (char *dest, size_t destlen, char op, break; case 'N': -#ifdef USE_IMAP if (imap_is_magic (folder->ff->desc, NULL) == M_IMAP) { if (!optional) { snprintf (tmp, sizeof (tmp), "%%%sd", fmt); @@ -286,7 +263,6 @@ static const char *folder_format_str (char *dest, size_t destlen, char op, optional = 0; break; } -#endif snprintf (tmp, sizeof (tmp), "%%%sc", fmt); snprintf (dest, destlen, tmp, folder->ff->new ? 'N' : ' '); break; @@ -333,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, @@ -451,9 +427,7 @@ static void add_folder (MUTTMENU * m, struct browser_state *state, (state->entry)[state->entrylen].new = new; (state->entry)[state->entrylen].name = m_strdup(name); (state->entry)[state->entrylen].desc = m_strdup(name); -#ifdef USE_IMAP (state->entry)[state->entrylen].imap = 0; -#endif #ifdef USE_NNTP if (option (OPTNEWS)) (state->entry)[state->entrylen].nd = (NNTP_DATA *) data; @@ -466,9 +440,7 @@ static void init_state (struct browser_state *state, MUTTMENU * menu) state->entrylen = 0; state->entrymax = 256; state->entry = p_new(struct folder_file, state->entrymax); -#ifdef USE_IMAP state->imap_browse = 0; -#endif if (menu) menu->data = state->entry; } @@ -479,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; @@ -501,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 */ @@ -560,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; } @@ -580,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; @@ -595,24 +567,23 @@ 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); -#ifdef USE_IMAP if (tmp->magic == M_IMAP) { #ifdef USE_NNTP add_folder (menu, state, tmp->path, NULL, NULL, tmp->new); @@ -621,7 +592,6 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state) #endif continue; } -#endif if (tmp->magic == M_POP) { #ifdef USE_NNTP add_folder (menu, state, tmp->path, NULL, NULL, tmp->new); @@ -668,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; @@ -686,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]; @@ -716,12 +686,10 @@ static void init_menu (struct browser_state *state, MUTTMENU * menu, else { m_strcpy(path, sizeof(path), LastDir); mutt_pretty_mailbox (path); -#ifdef USE_IMAP if (state->imap_browse && option (OPTIMAPLSUB)) snprintf (title, titlelen, _("Subscribed [%s], File mask: %s"), path, NONULL (Mask.pattern)); else -#endif snprintf (title, titlelen, _("Directory [%s], File mask: %s"), path, NONULL (Mask.pattern)); } @@ -746,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]; @@ -773,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; @@ -791,7 +759,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, #endif if (*f) { mutt_expand_path (f, flen); -#ifdef USE_IMAP if (imap_is_magic (f, NULL) == M_IMAP) { init_state (&state, NULL); state.imap_browse = 1; @@ -799,7 +766,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, m_strcpy(LastDir, sizeof(LastDir), state.folder); } else { -#endif for (i = m_strlen(f) - 1; i > 0 && f[i] != '/'; i--); if (i > 0) { if (f[0] == '/') { @@ -824,9 +790,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, else m_strcpy(prefix, sizeof(prefix), f + i + 1); killPrefix = 1; -#ifdef USE_IMAP } -#endif } else { if (!folder) @@ -834,14 +798,12 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, else if (!LastDir[0]) m_strcpy(LastDir, sizeof(LastDir), NONULL(Maildir)); -#ifdef USE_IMAP if (!buffy && imap_is_magic (LastDir, NULL) == M_IMAP) { init_state (&state, NULL); state.imap_browse = 1; imap_browse (LastDir, &state); browser_sort (&state); } -#endif } *f = 0; @@ -851,9 +813,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, goto bail; } else -#ifdef USE_IMAP if (!state.imap_browse) -#endif if (examine_directory (NULL, &state, LastDir, prefix) == -1) goto bail; @@ -887,29 +847,23 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, if (S_ISDIR (state.entry[menu->current].mode) || (S_ISLNK (state.entry[menu->current].mode) && link_is_dir (LastDir, state.entry[menu->current].name)) -#ifdef USE_IMAP || state.entry[menu->current].inferiors -#endif ) { /* make sure this isn't a MH or maildir mailbox */ if (buffy) { m_strcpy(buf, sizeof(buf), state.entry[menu->current].name); mutt_expand_path (buf, sizeof (buf)); } -#ifdef USE_IMAP else if (state.imap_browse) { m_strcpy(buf, sizeof(buf), state.entry[menu->current].name); } -#endif else mutt_concat_path(buf, sizeof(buf), LastDir, state.entry[menu->current].name); if ((mx_get_magic (buf) <= 0) -#ifdef USE_IMAP - || state.entry[menu->current].inferiors -#endif - ) { + || state.entry[menu->current].inferiors) + { char OldLastDir[_POSIX_PATH_MAX]; /* save the old directory */ @@ -936,7 +890,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, state.entry[menu->current].name); mutt_expand_path (LastDir, sizeof (LastDir)); } -#ifdef USE_IMAP else if (state.imap_browse) { int n; ciss_url_t url; @@ -950,12 +903,11 @@ 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; } } -#endif else { char tmp[_POSIX_PATH_MAX]; @@ -970,7 +922,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, killPrefix = 0; } buffy = 0; -#ifdef USE_IMAP if (state.imap_browse) { init_state (&state, NULL); state.imap_browse = 1; @@ -979,7 +930,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, menu->data = state.entry; } else -#endif if (examine_directory (menu, &state, LastDir, prefix) == -1) { /* try to restore the old values */ m_strcpy(LastDir, sizeof(LastDir), OldLastDir); @@ -1004,10 +954,8 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, m_strcpy(f, flen, state.entry[menu->current].name); mutt_expand_path (f, flen); } -#ifdef USE_IMAP else if (state.imap_browse) m_strcpy(f, flen, state.entry[menu->current].name); -#endif else mutt_concat_path(f, flen, LastDir, state.entry[menu->current].name); @@ -1018,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; @@ -1053,7 +1001,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, mutt_message ("%s", state.entry[menu->current].name); break; -#ifdef USE_IMAP case OP_BROWSER_TOGGLE_LSUB: if (option (OPTIMAPLSUB)) { unset_option (OPTIMAPLSUB); @@ -1138,7 +1085,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, p_delete(&mx.mbox); } break; -#endif case OP_CHANGE_DIRECTORY: @@ -1148,14 +1094,12 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, #endif m_strcpy(buf, sizeof(buf), LastDir); -#ifdef USE_IMAP if (!state.imap_browse) -#endif { /* 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] = '/'; } @@ -1163,7 +1107,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, buf[0]) { buffy = 0; mutt_expand_path (buf, sizeof (buf)); -#ifdef USE_IMAP if (imap_is_magic (buf, NULL) == M_IMAP) { m_strcpy(LastDir, sizeof(LastDir), buf); destroy_state (&state); @@ -1177,7 +1120,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, init_menu (&state, menu, title, sizeof (title), buffy); } else -#endif if (stat (buf, &st) == 0) { if (S_ISDIR (st.st_mode)) { destroy_state (&state); @@ -1236,7 +1178,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, Mask.not = not; destroy_state (&state); -#ifdef USE_IMAP if (state.imap_browse) { init_state (&state, NULL); state.imap_browse = 1; @@ -1246,7 +1187,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, init_menu (&state, menu, title, sizeof (title), buffy); } else -#endif if (examine_directory (menu, &state, LastDir, NULL) == 0) init_menu (&state, menu, title, sizeof (title), buffy); else { @@ -1321,7 +1261,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, if (examine_mailboxes (menu, &state) == -1) goto bail; } -#ifdef USE_IMAP else if (imap_is_magic (LastDir, NULL) == M_IMAP) { init_state (&state, NULL); state.imap_browse = 1; @@ -1329,7 +1268,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, browser_sort (&state); menu->data = state.entry; } -#endif else if (examine_directory (menu, &state, LastDir, prefix) == -1) goto bail; init_menu (&state, menu, title, sizeof (title), buffy); @@ -1361,7 +1299,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, break; } -#ifdef USE_IMAP if (state.entry[menu->current].selectable) { m_strcpy(f, flen, state.entry[menu->current].name); destroy_state (&state); @@ -1369,7 +1306,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, goto bail; } else -#endif if (S_ISDIR (state.entry[menu->current].mode) || (S_ISLNK (state.entry[menu->current].mode) && link_is_dir (LastDir, state.entry[menu->current].name))) { @@ -1386,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 @@ -1398,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; @@ -1433,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) { @@ -1452,10 +1374,8 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, break; #endif /* USE_NNTP */ -#if defined USE_IMAP || defined USE_NNTP case OP_BROWSER_SUBSCRIBE: case OP_BROWSER_UNSUBSCRIBE: -#endif #ifdef USE_NNTP case OP_SUBSCRIBE_PATTERN: case OP_UNSUBSCRIBE_PATTERN: @@ -1497,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) @@ -1529,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; @@ -1550,18 +1455,14 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, regfree (rx); p_delete(&rx); } -#ifdef USE_IMAP else -#endif /* USE_IMAP && USE_NNTP */ #endif /* USE_NNTP */ -#ifdef USE_IMAP { if (i == OP_BROWSER_SUBSCRIBE) imap_subscribe (state.entry[menu->current].name, 1); else imap_subscribe (state.entry[menu->current].name, 0); } -#endif /* USE_IMAP */ } }