X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=f17b1f577ca1398825bc4617bbb59c5eea90599b;hp=fd927536c9b4a8729de835c379ced69ecfb73864;hb=eab27dfc9eb0f7b21b560f37ec28f48cfbfa9f40;hpb=688ac22f746f785c27ac99ac86aa85a3035a3638 diff --git a/browser.c b/browser.c index fd92753..f17b1f5 100644 --- a/browser.c +++ b/browser.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include #include @@ -27,28 +27,7 @@ #include #ifdef USE_NNTP -#include -#endif - -static struct mapping_t FolderHelp[] = { - {N_("Exit"), OP_EXIT}, - {N_("Chdir"), OP_CHANGE_DIRECTORY}, - {N_("Mask"), OP_ENTER_MASK}, - {N_("Help"), OP_HELP}, - {NULL, OP_NULL} -}; - -#ifdef USE_NNTP -static struct mapping_t FolderNewsHelp[] = { - {N_("Exit"), OP_EXIT}, - {N_("List"), OP_TOGGLE_MAILBOXES}, - {N_("Subscribe"), OP_BROWSER_SUBSCRIBE}, - {N_("Unsubscribe"), OP_BROWSER_UNSUBSCRIBE}, - {N_("Catchup"), OP_CATCHUP}, - {N_("Mask"), OP_ENTER_MASK}, - {N_("Help"), OP_HELP}, - {NULL, OP_NULL} -}; +#include "nntp.h" #endif typedef struct folder_t { @@ -65,9 +44,9 @@ static void destroy_state (struct browser_state *state) 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); @@ -145,16 +124,16 @@ static int link_is_dir (const char *folder, const char *path) 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[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); @@ -184,9 +163,9 @@ static const char *folder_format_str (char *dest, ssize_t destlen, char op, 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) ? "@" : @@ -200,9 +179,8 @@ static const char *folder_format_str (char *dest, ssize_t destlen, char op, 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) != @@ -300,24 +278,23 @@ static const char *folder_format_str (char *dest, ssize_t destlen, char op, 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[STRING], tmp[STRING]; - FOLDER *folder = (FOLDER *) data; + FOLDER *folder = data.ptr; switch (op) { case 'C': @@ -350,11 +327,11 @@ static const char *newsgroup_format_str (char *dest, ssize_t destlen, char op, 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); @@ -372,11 +349,11 @@ static const char *newsgroup_format_str (char *dest, ssize_t destlen, char op, snprintf (dest, destlen, tmp, Context->new); } else if (option (OPTMARKOLD) && - folder->ff->nd->lastCached >= folder->ff->nd->firstMessage && - folder->ff->nd->lastCached <= folder->ff->nd->lastMessage) { + folder->ff->nd->lastCached >= folder->ff->nd->first && + folder->ff->nd->lastCached <= folder->ff->nd->last) { snprintf (tmp, sizeof (tmp), "%%%sd", fmt); snprintf (dest, destlen, tmp, - folder->ff->nd->lastMessage - folder->ff->nd->lastCached); + folder->ff->nd->last - folder->ff->nd->lastCached); } else { snprintf (tmp, sizeof (tmp), "%%%sd", fmt); @@ -430,7 +407,7 @@ static void add_folder (MUTTMENU * m, struct browser_state *state, (state->entry)[state->entrylen].imap = 0; #ifdef USE_NNTP if (option (OPTNEWS)) - (state->entry)[state->entrylen].nd = (NNTP_DATA *) data; + (state->entry)[state->entrylen].nd = data; #endif (state->entrylen)++; } @@ -451,26 +428,19 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state, { #ifdef USE_NNTP if (option (OPTNEWS)) { - string_list_t *tmp; - NNTP_DATA *data; - NNTP_SERVER *news = CurrentNewsSrv; + nntp_data_t *data; + nntp_server_t *news = CurrentNewsSrv; /* buffy_check (0); */ init_state (state, menu); - for (tmp = news->list; tmp; tmp = tmp->next) { - if (!(data = (NNTP_DATA *) tmp->data)) - continue; - nntp_sync_sidebar (data); + for (data = news->list; data; data = data->next) { + nntp_sync_sidebar(data); 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 (); } @@ -517,7 +487,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state, 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); @@ -550,16 +520,13 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state) #ifdef USE_NNTP if (option (OPTNEWS)) { - string_list_t *tmp; - NNTP_DATA *data; - NNTP_SERVER *news = CurrentNewsSrv; + nntp_data_t *data; + nntp_server_t *news = CurrentNewsSrv; /* buffy_check (0); */ init_state (state, menu); - for (tmp = news->list; tmp; tmp = tmp->next) { - if ((data = (NNTP_DATA*) tmp->data) == NULL) - continue; + for (data = news->list; data; data = data->next) { nntp_sync_sidebar (data); if ((data->new || (data->subscribed && (!option (OPTSHOWONLYUNREAD)|| data->unread)))) @@ -645,12 +612,12 @@ static void folder_entry (char *s, ssize_t slen, MUTTMENU * menu, int num) #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, @@ -712,12 +679,11 @@ static int file_tag (MUTTMENU * menu, int n, int m) return ff->tagged - ot; } -void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files, - int *numfiles) +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[STRING]; char title[STRING]; struct browser_state state; MUTTMENU *menu; @@ -739,14 +705,12 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files, if (*f) m_strcpy(prefix, sizeof(prefix), f); else { - string_list_t *list; + nntp_data_t *list; /* default state for news reader mode is browse subscribed newsgroups */ buffy = 0; for (list = CurrentNewsSrv->list; list; list = list->next) { - NNTP_DATA *data = (NNTP_DATA *) list->data; - - if (data && data->subscribed) { + if (list->subscribed) { buffy = 1; break; } @@ -823,13 +787,6 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files, menu->data = state.entry; if (multiple) menu->tag = file_tag; - - menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_FOLDER, -#ifdef USE_NNTP - (option (OPTNEWS)) ? FolderNewsHelp : -#endif - FolderHelp); - init_menu (&state, menu, title, sizeof (title), buffy); for (;;) { @@ -932,7 +889,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files, /* 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; } } @@ -1150,7 +1107,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files, 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 */ @@ -1159,7 +1116,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files, s = vskipspaces(s); if (*s == '!') { s = vskipspaces(s + 1); - not = 1; + neg = 1; } if ((err = REGCOMP (rx, s, REG_NOSUB)) != 0) { @@ -1173,7 +1130,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files, regfree (Mask.rx); p_delete(&Mask.rx); Mask.rx = rx; - Mask.not = not; + Mask.neg = neg; destroy_state (&state); if (state.imap_browse) { @@ -1333,7 +1290,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files, case OP_UNCATCHUP: if (option (OPTNEWS)) { struct folder_file *folder_f = &state.entry[menu->current]; - NNTP_DATA *nd; + nntp_data_t *nd; if (i == OP_CATCHUP) nd = mutt_newsgroup_catchup (CurrentNewsSrv, folder_f->name); @@ -1353,12 +1310,10 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files, break; { - string_list_t *tmp; - NNTP_DATA *data; + nntp_data_t *data; - for (tmp = CurrentNewsSrv->list; tmp; tmp = tmp->next) { - if ((data = (NNTP_DATA *) tmp->data)) - data->deleted = 1; + for (data = CurrentNewsSrv->list; data; data = data->next) { + data->deleted = 1; } } nntp_get_active (CurrentNewsSrv); @@ -1381,8 +1336,8 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files, regex_t *rx = p_new(regex_t, 1); char *s = buf; int j = menu->current; - NNTP_DATA *nd; - NNTP_SERVER *news = CurrentNewsSrv; + nntp_data_t *nd; + nntp_server_t *news = CurrentNewsSrv; if (i == OP_SUBSCRIBE_PATTERN || i == OP_UNSUBSCRIBE_PATTERN) { char tmp[STRING]; @@ -1432,13 +1387,9 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files, } } if (i == OP_SUBSCRIBE_PATTERN) { - string_list_t *grouplist = NULL; - - if (news) - grouplist = news->list; - for (; grouplist; grouplist = grouplist->next) { - nd = (NNTP_DATA *) grouplist->data; - if (nd && nd->group && !nd->subscribed) { + nd = news ? news->list : NULL; + for (; nd; nd = nd->next) { + if (nd->group && !nd->subscribed) { if (regexec (rx, nd->group, 0, NULL, 0) == 0) { mutt_newsgroup_subscribe (news, nd->group); add_folder (menu, &state, nd->group, NULL, nd, nd->new); @@ -1448,7 +1399,6 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files, init_menu (&state, menu, title, sizeof (title), buffy); } mutt_newsrc_update (news); - nntp_clear_cacheindex (news); if (i != OP_BROWSER_SUBSCRIBE && i != OP_BROWSER_UNSUBSCRIBE) regfree (rx); p_delete(&rx);