X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=80756558fbb596a431a19aae5c3eb67dcece7241;hp=18b442f017255e0d685327159fef59fa9844b52a;hb=dc726add2e8fe52be1f6859ea7cbe4651498eeb8;hpb=9274cbe8e6410ddb95ddc667faa678a29da85420 diff --git a/browser.c b/browser.c index 18b442f..8075655 100644 --- a/browser.c +++ b/browser.c @@ -7,64 +7,23 @@ * 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 "mutt.h" -#include "enter.h" -#include "mx.h" -#include "mutt_curses.h" -#include "mutt_menu.h" #include "buffy.h" -#include "mapping.h" #include "sort.h" #include "browser.h" #include "attach.h" -#ifdef USE_IMAP -#include "imap.h" -#include "imap/mx_imap.h" -#endif -#ifdef USE_NNTP -#include "nntp.h" -#endif -#include "sidebar.h" - -#include "lib/list.h" - -#include -#include -#include -#include -#include -#include -#include - -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} -}; -#endif +#include typedef struct folder_t { struct folder_file *ff; @@ -80,13 +39,11 @@ 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); } -#ifdef USE_IMAP p_delete(&state->folder); -#endif p_delete(&state->entry); } @@ -95,7 +52,7 @@ static int browser_compare_subject (const void *a, const void *b) struct folder_file *pa = (struct folder_file *) a; struct folder_file *pb = (struct folder_file *) b; - int r = str_coll (pa->name, pb->name); + int r = strcoll(NONULL(pa->name), NONULL(pb->name)); return ((BrowserSort & SORT_REVERSE) ? -r : r); } @@ -128,17 +85,9 @@ static void browser_sort (struct browser_state *state) case SORT_ORDER: return; case SORT_DATE: -#ifdef USE_NNTP - if (option (OPTNEWS)) - return; -#endif f = browser_compare_date; break; case SORT_SIZE: -#ifdef USE_NNTP - if (option (OPTNEWS)) - return; -#endif f = browser_compare_size; break; case SORT_SUBJECT: @@ -154,7 +103,7 @@ static int link_is_dir (const char *folder, const char *path) struct stat st; char fullpath[_POSIX_PATH_MAX]; - mutt_concat_path (fullpath, folder, path, sizeof (fullpath)); + mutt_concat_path(fullpath, sizeof(fullpath), folder, path); if (stat (fullpath, &st) == 0) return (S_ISDIR (st.st_mode)); @@ -162,16 +111,16 @@ 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, - 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); @@ -200,12 +149,10 @@ 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); + s = NONULL(folder->ff->desc); else -#endif - 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) ? "@" : @@ -219,9 +166,8 @@ static const char *folder_format_str (char *dest, size_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) != @@ -239,7 +185,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", @@ -247,7 +192,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; @@ -275,7 +219,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); @@ -285,7 +228,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; @@ -323,108 +265,17 @@ static const char *folder_format_str (char *dest, size_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); -} - -#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) -{ - char fn[SHORT_STRING], tmp[SHORT_STRING]; - FOLDER *folder = (FOLDER *) data; - - switch (op) { - case 'C': - snprintf (tmp, sizeof (tmp), "%%%sd", fmt); - snprintf (dest, destlen, tmp, folder->num + 1); - break; - case 'f': - strncpy (fn, folder->ff->name, sizeof (fn) - 1); - snprintf (tmp, sizeof (tmp), "%%%ss", fmt); - snprintf (dest, destlen, tmp, fn); - break; - - case 'N': - snprintf (tmp, sizeof (tmp), "%%%sc", fmt); - if (folder->ff->nd->subscribed) - snprintf (dest, destlen, tmp, ' '); - else - snprintf (dest, destlen, tmp, folder->ff->new ? 'N' : 'u'); - break; - - case 'M': - snprintf (tmp, sizeof (tmp), "%%%sc", fmt); - if (folder->ff->nd->deleted) - snprintf (dest, destlen, tmp, 'D'); - else - snprintf (dest, destlen, tmp, folder->ff->nd->allowed ? ' ' : '-'); - break; - - case 's': - if (flags & M_FORMAT_OPTIONAL) { - if (folder->ff->nd->unread != 0) - mutt_FormatString (dest, destlen, ifstring, newsgroup_format_str, - data, flags); - else - mutt_FormatString (dest, destlen, elsestring, newsgroup_format_str, - data, flags); - } - else if (Context && Context->data == folder->ff->nd) { - snprintf (tmp, sizeof (tmp), "%%%sd", fmt); - snprintf (dest, destlen, tmp, Context->unread); - } - else { - snprintf (tmp, sizeof (tmp), "%%%sd", fmt); - snprintf (dest, destlen, tmp, folder->ff->nd->unread); - } - break; - - case 'n': - if (Context && Context->data == folder->ff->nd) { - snprintf (tmp, sizeof (tmp), "%%%sd", fmt); - 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) { - snprintf (tmp, sizeof (tmp), "%%%sd", fmt); - snprintf (dest, destlen, tmp, - folder->ff->nd->lastMessage - folder->ff->nd->lastCached); - } - else { - snprintf (tmp, sizeof (tmp), "%%%sd", fmt); - snprintf (dest, destlen, tmp, folder->ff->nd->unread); - } - break; + if (flags & M_FORMAT_OPTIONAL) + m_strformat(dest, destlen, 0, optional ? ifstr : elstr, + folder_format_str, data, 0); - case 'd': - if (folder->ff->nd->desc != NULL) { - snprintf (tmp, sizeof (tmp), "%%%ss", fmt); - snprintf (dest, destlen, tmp, folder->ff->nd->desc); - } - else { - snprintf (tmp, sizeof (tmp), "%%%ss", fmt); - snprintf (dest, destlen, tmp, ""); - } - break; - } - return (src); + return src; } -#endif /* USE_NNTP */ + static void add_folder (MUTTMENU * m, struct browser_state *state, - const char *name, const struct stat *s, - void *data, int new) + const char *name, const struct stat *s, int new) { if (state->entrylen == state->entrymax) { /* need to allocate more space */ @@ -444,13 +295,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; -#endif (state->entrylen)++; } @@ -459,9 +304,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; } @@ -470,89 +313,63 @@ static void init_state (struct browser_state *state, MUTTMENU * menu) static int examine_directory (MUTTMENU * menu, struct browser_state *state, char *d, const char *prefix) { -#ifdef USE_NNTP - if (option (OPTNEWS)) { - LIST *tmp; - NNTP_DATA *data; - NNTP_SERVER *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); - if (prefix && *prefix && strncmp (prefix, data->group, - m_strlen(prefix)) != 0) - continue; - if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.not)) + + struct stat s; + DIR *dp; + struct dirent *de; + char buffer[_POSIX_PATH_MAX + STRING]; + int i = -1; + + while (stat (d, &s) == -1) { + if (errno == ENOENT) { + /* The last used directory is deleted, try to use the parent dir. */ + char *c = strrchr (d, '/'); + + if (c && (c > d)) { + *c = 0; continue; - add_folder (menu, state, data->group, NULL, data, data->new); - } - sidebar_draw (CurrentMenu); - } - else -#endif /* USE_NNTP */ - { - struct stat s; - DIR *dp; - struct dirent *de; - char buffer[_POSIX_PATH_MAX + SHORT_STRING]; - int i = -1; - - while (stat (d, &s) == -1) { - if (errno == ENOENT) { - /* The last used directory is deleted, try to use the parent dir. */ - char *c = strrchr (d, '/'); - - if (c && (c > d)) { - *c = 0; - continue; - } } - mutt_perror (d); - return (-1); } + mutt_perror (d); + return (-1); + } - if (!S_ISDIR (s.st_mode)) { - mutt_error (_("%s is not a directory."), d); - return (-1); - } + if (!S_ISDIR (s.st_mode)) { + mutt_error (_("%s is not a directory."), d); + return (-1); + } - buffy_check (0); + buffy_check (0); - if ((dp = opendir (d)) == NULL) { - mutt_perror (d); - return (-1); - } + if ((dp = opendir (d)) == NULL) { + mutt_perror (d); + return (-1); + } - init_state (state, menu); + init_state (state, menu); - while ((de = readdir (dp)) != NULL) { - if (str_cmp (de->d_name, ".") == 0) - continue; /* we don't need . */ + while ((de = readdir (dp)) != NULL) { + if (m_strcmp(de->d_name, ".") == 0) + continue; /* we don't need . */ - if (prefix && *prefix - && str_ncmp (prefix, de->d_name, m_strlen(prefix)) != 0) - continue; - if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.not)) - continue; + if (m_strncmp(prefix, de->d_name, m_strlen(prefix)) != 0) + continue; + if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.neg)) + continue; - mutt_concat_path (buffer, d, de->d_name, sizeof (buffer)); - if (lstat (buffer, &s) == -1) - continue; + mutt_concat_path(buffer, sizeof(buffer), d, de->d_name); + if (lstat (buffer, &s) == -1) + continue; - if ((!S_ISREG (s.st_mode)) && (!S_ISDIR (s.st_mode)) && - (!S_ISLNK (s.st_mode))) - continue; + if ((!S_ISREG (s.st_mode)) && (!S_ISDIR (s.st_mode)) && + (!S_ISLNK (s.st_mode))) + continue; - i = buffy_lookup (buffer); - add_folder (menu, state, de->d_name, &s, NULL, i >= 0 ? ((BUFFY*) Incoming->data[i])->new : 0); - } - closedir (dp); + i = buffy_lookup (buffer); + add_folder (menu, state, de->d_name, &s, i >= 0 ? Incoming.arr[i]->new : 0); } - sidebar_draw (CurrentMenu); + closedir (dp); + sidebar_draw (); browser_sort (state); return 0; } @@ -562,106 +379,61 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state) { struct stat s; char buffer[LONG_STRING]; + int i = 0; + BUFFY* tmp; -#ifdef USE_NNTP - if (option (OPTNEWS)) { - LIST *tmp; - NNTP_DATA *data; - NNTP_SERVER *news = CurrentNewsSrv; + if (!Incoming.len) + return (-1); + buffy_check (0); -/* buffy_check (0); */ - init_state (state, menu); + init_state (state, menu); - for (tmp = news->list; tmp; tmp = tmp->next) { - if ((data = (NNTP_DATA*) tmp->data) == NULL) - continue; - nntp_sync_sidebar (data); - if ((data->new || (data->subscribed && - (!option (OPTSHOWONLYUNREAD)|| data->unread)))) - add_folder (menu, state, data->group, NULL, data, data->new); + for (i = 0; i < Incoming.len; i++) { + tmp = Incoming.arr[i]; + tmp->magic = mx_get_magic (tmp->path); + if (tmp->magic == M_IMAP) { + add_folder (menu, state, tmp->path, NULL, tmp->new); + continue; } - sidebar_draw (CurrentMenu); - } - else -#endif - { - int i = 0; - BUFFY* tmp; - - if (!Incoming) - return (-1); - buffy_check (0); - - init_state (state, menu); - - for (i = 0; i < Incoming->length; i++) { - tmp = (BUFFY*) Incoming->data[i]; - tmp->magic = mx_get_magic (tmp->path); -#ifdef USE_IMAP - if (tmp->magic == M_IMAP) { - add_folder (menu, state, tmp->path, NULL, NULL, tmp->new); - continue; - } -#endif -#ifdef USE_POP - if (tmp->magic == M_POP) { - add_folder (menu, state, tmp->path, NULL, NULL, tmp->new); - continue; - } -#endif -#ifdef USE_NNTP - if (tmp->magic == M_NNTP) { - add_folder (menu, state, tmp->path, NULL, NULL, tmp->new); - continue; - } -#endif - if (lstat (tmp->path, &s) == -1) - continue; - - if ((!S_ISREG (s.st_mode)) && (!S_ISDIR (s.st_mode)) && - (!S_ISLNK (s.st_mode))) - continue; + if (tmp->magic == M_POP) { + add_folder (menu, state, tmp->path, NULL, tmp->new); + continue; + } + if (lstat (tmp->path, &s) == -1) + continue; - strfcpy (buffer, NONULL (tmp->path), sizeof (buffer)); - mutt_pretty_mailbox (buffer); + if ((!S_ISREG (s.st_mode)) && (!S_ISDIR (s.st_mode)) && + (!S_ISLNK (s.st_mode))) + continue; - add_folder (menu, state, buffer, &s, NULL, tmp->new); - } + m_strcpy(buffer, sizeof(buffer), NONULL(tmp->path)); + mutt_pretty_mailbox (buffer); + add_folder (menu, state, buffer, &s, tmp->new); } + browser_sort (state); return 0; } static int select_file_search (MUTTMENU * menu, regex_t * re, int n) { -#ifdef USE_NNTP - if (option (OPTNEWS)) - return (regexec - (re, ((struct folder_file *) menu->data)[n].desc, 0, NULL, 0)); -#endif return (regexec (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; folder.ff = &((struct folder_file *) menu->data)[num]; folder.num = num; -#ifdef USE_NNTP - if (option (OPTNEWS)) - mutt_FormatString (s, slen, NONULL (GroupFormat), newsgroup_format_str, - (unsigned long) &folder, M_FORMAT_ARROWCURSOR); - else -#endif - mutt_FormatString (s, slen, NONULL (FolderFormat), folder_format_str, - (unsigned long) &folder, M_FORMAT_ARROWCURSOR); + m_strformat(s, slen, getmaxx(main_w), 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]; @@ -676,27 +448,15 @@ static void init_menu (struct browser_state *state, MUTTMENU * menu, menu->tagged = 0; -#ifdef USE_NNTP - if (option (OPTNEWS)) { - if (buffy) - snprintf (title, titlelen, "%s", _("Subscribed newsgroups")); - else - snprintf (title, titlelen, _("Newsgroups on server [%s]"), - CurrentNewsSrv->conn->account.host); - } - else -#endif if (buffy) - snprintf (title, titlelen, _("Mailboxes [%d]"), buffy_check (0)); + snprintf(title, titlelen, _("Mailboxes [%d]"), buffy_check(0)); else { - strfcpy (path, LastDir, sizeof (path)); + 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)); } @@ -721,12 +481,11 @@ 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, - 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[SHORT_STRING]; char title[STRING]; struct browser_state state; MUTTMENU *menu; @@ -741,84 +500,55 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, p_clear(&state, 1); if (!folder) - strfcpy (LastDirBackup, LastDir, sizeof (LastDirBackup)); - -#ifdef USE_NNTP - if (option (OPTNEWS)) { - if (*f) - strfcpy (prefix, f, sizeof (prefix)); - else { - LIST *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; + m_strcpy(LastDirBackup, sizeof(LastDirBackup), LastDir); - if (data && data->subscribed) { - buffy = 1; - break; - } - } - } - } - else -#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; if (!imap_browse (f, &state)) - strfcpy (LastDir, state.folder, sizeof (LastDir)); + 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] == '/') { - if (i > sizeof (LastDir) - 1) - i = sizeof (LastDir) - 1; - strncpy (LastDir, f, i); - LastDir[i] = 0; + i = MIN(ssizeof(LastDir) - 1, i); + m_strcpy(LastDir, sizeof(LastDir), f); } else { - getcwd (LastDir, sizeof (LastDir)); - str_cat (LastDir, sizeof (LastDir), "/"); - str_ncat (LastDir, sizeof (LastDir), f, i); + getcwd(LastDir, sizeof(LastDir)); + m_strcat(LastDir, sizeof(LastDir), "/"); + m_strncat(LastDir, sizeof(LastDir), f, i); } } else { if (f[0] == '/') - strcpy (LastDir, "/"); /* __STRCPY_CHECKED__ */ + m_strcpy(LastDir, sizeof(LastDir), "/"); else getcwd (LastDir, sizeof (LastDir)); } if (i <= 0 && f[0] != '/') - strfcpy (prefix, f, sizeof (prefix)); + m_strcpy(prefix, sizeof(prefix), f); else - strfcpy (prefix, f + i + 1, sizeof (prefix)); + m_strcpy(prefix, sizeof(prefix), f + i + 1); killPrefix = 1; -#ifdef USE_IMAP } -#endif } else { if (!folder) getcwd (LastDir, sizeof (LastDir)); else if (!LastDir[0]) - strfcpy (LastDir, NONULL (Maildir), sizeof (LastDir)); + 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; @@ -828,9 +558,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; @@ -842,16 +570,9 @@ void _mutt_select_file (char *f, size_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); - FOREVER { + for (;;) { switch (i = mutt_menuLoop (menu)) { case OP_GENERIC_SELECT_ENTRY: @@ -864,37 +585,31 @@ 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) { - strfcpy (buf, state.entry[menu->current].name, sizeof (buf)); + m_strcpy(buf, sizeof(buf), state.entry[menu->current].name); mutt_expand_path (buf, sizeof (buf)); } -#ifdef USE_IMAP else if (state.imap_browse) { - strfcpy (buf, state.entry[menu->current].name, sizeof (buf)); + m_strcpy(buf, sizeof(buf), state.entry[menu->current].name); } -#endif else - mutt_concat_path (buf, LastDir, state.entry[menu->current].name, - sizeof (buf)); + 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 */ - strfcpy (OldLastDir, LastDir, sizeof (OldLastDir)); + m_strcpy(OldLastDir, sizeof(OldLastDir), LastDir); - if (str_cmp (state.entry[menu->current].name, "..") == 0) { - if (str_cmp ("..", LastDir + m_strlen(LastDir) - 2) == 0) - strcat (LastDir, "/.."); /* __STRCAT_CHECKED__ */ + if (m_strcmp(state.entry[menu->current].name, "..") == 0) { + if (m_strcmp("..", LastDir + m_strlen(LastDir) - 2) == 0) + m_strcat(LastDir, sizeof(LastDir), "/.."); else { char *p = strrchr (LastDir + 1, '/'); @@ -904,22 +619,21 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, if (LastDir[0] == '/') LastDir[1] = 0; else - strcat (LastDir, "/.."); /* __STRCAT_CHECKED__ */ + m_strcat(LastDir, sizeof(LastDir), "/.."); } } } else if (buffy) { - strfcpy (LastDir, state.entry[menu->current].name, - sizeof (LastDir)); + m_strcpy(LastDir, sizeof(LastDir), + 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; - strfcpy (LastDir, state.entry[menu->current].name, - sizeof (LastDir)); + m_strcpy(LastDir, sizeof(LastDir), + state.entry[menu->current].name); /* tack on delimiter here */ n = m_strlen(LastDir) + 1; @@ -927,18 +641,17 @@ 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]; - mutt_concat_path (tmp, LastDir, state.entry[menu->current].name, - sizeof (tmp)); - strfcpy (LastDir, tmp, sizeof (LastDir)); + mutt_concat_path(tmp, sizeof(tmp), LastDir, + state.entry[menu->current].name); + m_strcpy(LastDir, sizeof(LastDir), tmp); } destroy_state (&state); @@ -947,7 +660,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; @@ -956,12 +668,11 @@ 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 */ - strfcpy (LastDir, OldLastDir, sizeof (LastDir)); + m_strcpy(LastDir, sizeof(LastDir), OldLastDir); if (examine_directory (menu, &state, LastDir, prefix) == -1) { - strfcpy (LastDir, NONULL (Homedir), sizeof (LastDir)); + m_strcpy(LastDir, sizeof(LastDir), NONULL(mod_core.homedir)); goto bail; } } @@ -972,21 +683,14 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, } } -#ifdef USE_NNTP - if (buffy || option (OPTNEWS)) /* news have not path */ -#else - if (buffy) -#endif - { - strfcpy (f, state.entry[menu->current].name, flen); + if (buffy) { + m_strcpy(f, flen, state.entry[menu->current].name); mutt_expand_path (f, flen); } -#ifdef USE_IMAP else if (state.imap_browse) - strfcpy (f, state.entry[menu->current].name, flen); -#endif + m_strcpy(f, flen, state.entry[menu->current].name); else - mutt_concat_path (f, LastDir, state.entry[menu->current].name, flen); + mutt_concat_path(f, flen, LastDir, state.entry[menu->current].name); /* Fall through to OP_EXIT */ @@ -994,17 +698,18 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, if (multiple) { char **tfiles; - int i, j; + int j; + int h; if (menu->tagged) { *numfiles = menu->tagged; tfiles = p_new(char *, *numfiles); - for (i = 0, j = 0; i < state.entrylen; i++) { + for (h = 0, j = 0; h < state.entrylen; i++) { struct folder_file ff = state.entry[i]; char full[_POSIX_PATH_MAX]; if (ff.tagged) { - mutt_concat_path (full, LastDir, ff.name, sizeof (full)); + mutt_concat_path(full, sizeof(full), LastDir, ff.name); mutt_expand_path (full, sizeof (full)); tfiles[j++] = m_strdup(full); } @@ -1029,7 +734,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); @@ -1085,7 +789,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, 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; @@ -1114,24 +818,15 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, p_delete(&mx.mbox); } break; -#endif case OP_CHANGE_DIRECTORY: - -#ifdef USE_NNTP - if (option (OPTNEWS)) - break; -#endif - - strfcpy (buf, LastDir, sizeof (buf)); -#ifdef USE_IMAP + m_strcpy(buf, sizeof(buf), LastDir); if (!state.imap_browse) -#endif { /* add '/' at the end of the directory name if not already there */ - int 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] = '/'; } @@ -1139,9 +834,8 @@ 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) { - strfcpy (LastDir, buf, sizeof (LastDir)); + m_strcpy(LastDir, sizeof(LastDir), buf); destroy_state (&state); init_state (&state, NULL); state.imap_browse = 1; @@ -1153,12 +847,11 @@ 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); if (examine_directory (menu, &state, buf, prefix) == 0) - strfcpy (LastDir, buf, sizeof (LastDir)); + m_strcpy(LastDir, sizeof(LastDir), buf); else { mutt_error _("Error scanning directory."); @@ -1182,21 +875,20 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, case OP_ENTER_MASK: - strfcpy (buf, NONULL (Mask.pattern), sizeof (buf)); + m_strcpy(buf, sizeof(buf), NONULL(Mask.pattern)); 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 */ if (!buf[0]) - strfcpy (buf, ".", sizeof (buf)); - SKIPWS (s); + m_strcpy(buf, sizeof(buf), "."); + s = vskipspaces(s); if (*s == '!') { - s++; - SKIPWS (s); - not = 1; + s = vskipspaces(s + 1); + neg = 1; } if ((err = REGCOMP (rx, s, REG_NOSUB)) != 0) { @@ -1206,14 +898,13 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, mutt_error ("%s", buf); } else { - str_replace (&Mask.pattern, buf); + m_strreplace(&Mask.pattern, buf); regfree (Mask.rx); p_delete(&Mask.rx); Mask.rx = rx; - Mask.not = not; + Mask.neg = neg; destroy_state (&state); -#ifdef USE_IMAP if (state.imap_browse) { init_state (&state, NULL); state.imap_browse = 1; @@ -1223,7 +914,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 { @@ -1298,7 +988,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; @@ -1306,7 +995,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); @@ -1323,7 +1011,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, snprintf (buf, sizeof (buf), "%s/", LastDir); if (mutt_get_field (_("New file name: "), buf, sizeof (buf), M_FILE) == 0) { - strfcpy (f, buf, flen); + m_strcpy(f, flen, buf); destroy_state (&state); mutt_menuDestroy (&menu); goto bail; @@ -1338,15 +1026,13 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, break; } -#ifdef USE_IMAP if (state.entry[menu->current].selectable) { - strfcpy (f, state.entry[menu->current].name, flen); + m_strcpy(f, flen, state.entry[menu->current].name); destroy_state (&state); mutt_menuDestroy (&menu); 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))) { @@ -1356,14 +1042,14 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, } else { BODY *b; - char buf[_POSIX_PATH_MAX]; + char nbuf[_POSIX_PATH_MAX]; - mutt_concat_path (buf, LastDir, state.entry[menu->current].name, - sizeof (buf)); - b = mutt_make_file_attach (buf); + mutt_concat_path(nbuf, sizeof(nbuf), LastDir, + state.entry[menu->current].name); + 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 @@ -1371,180 +1057,18 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, } break; -#ifdef USE_NNTP - case OP_CATCHUP: - case OP_UNCATCHUP: - if (option (OPTNEWS)) { - struct folder_file *f = &state.entry[menu->current]; - NNTP_DATA *nd; - - if (i == OP_CATCHUP) - nd = mutt_newsgroup_catchup (CurrentNewsSrv, f->name); - else - nd = mutt_newsgroup_uncatchup (CurrentNewsSrv, 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; - - case OP_LOAD_ACTIVE: - if (!option (OPTNEWS)) - break; - - { - LIST *tmp; - NNTP_DATA *data; - - for (tmp = CurrentNewsSrv->list; tmp; tmp = tmp->next) { - if ((data = (NNTP_DATA *) tmp->data)) - data->deleted = 1; - } - } - nntp_get_active (CurrentNewsSrv); - - destroy_state (&state); - if (buffy) - examine_mailboxes (menu, &state); - else - examine_directory (menu, &state, NULL, NULL); - init_menu (&state, menu, title, sizeof (title), buffy); - 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: - if (option (OPTNEWS)) { - regex_t *rx = p_new(regex_t, 1); - char *s = buf; - int j = menu->current; - NNTP_DATA *nd; - NNTP_SERVER *news = CurrentNewsSrv; - - if (i == OP_SUBSCRIBE_PATTERN || i == OP_UNSUBSCRIBE_PATTERN) { - char tmp[STRING]; - int err; - - buf[0] = 0; - if (i == OP_SUBSCRIBE_PATTERN) - snprintf (tmp, sizeof (tmp), _("Subscribe pattern: ")); - else - snprintf (tmp, sizeof (tmp), _("Unsubscribe pattern: ")); - if (mutt_get_field (tmp, buf, sizeof (buf), 0) != 0 || !buf[0]) { - p_delete(&rx); - break; - } - - if ((err = REGCOMP (rx, s, REG_NOSUB)) != 0) { - regerror (err, rx, buf, sizeof (buf)); - regfree (rx); - p_delete(&rx); - mutt_error ("%s", buf); - break; - } - menu->redraw = REDRAW_FULL; - j = 0; - } - else if (!state.entrylen) { - mutt_error _("No newsgroups match the mask"); - - break; - } - - for (; j < state.entrylen; j++) { - struct folder_file *f = &state.entry[j]; - - if (i == OP_BROWSER_SUBSCRIBE || i == OP_BROWSER_UNSUBSCRIBE || - regexec (rx, f->name, 0, NULL, 0) == 0) { - if (i == OP_BROWSER_SUBSCRIBE || i == OP_SUBSCRIBE_PATTERN) - nd = mutt_newsgroup_subscribe (news, f->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); - } */ - } - if (i == OP_BROWSER_SUBSCRIBE || i == OP_BROWSER_UNSUBSCRIBE) { - if (menu->current + 1 < menu->max) - menu->current++; - menu->redraw = REDRAW_MOTION_RESYNCH; - break; - } - } - if (i == OP_SUBSCRIBE_PATTERN) { - LIST *grouplist = NULL; - - if (news) - grouplist = news->list; - for (; grouplist; grouplist = grouplist->next) { - nd = (NNTP_DATA *) grouplist->data; - if (nd && 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); - } - } - } - 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); - } -#ifdef USE_IMAP + if (i == OP_BROWSER_SUBSCRIBE) + imap_subscribe (state.entry[menu->current].name, 1); 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 */ + imap_subscribe (state.entry[menu->current].name, 0); } } bail: if (!folder) - strfcpy (LastDir, LastDirBackup, sizeof (LastDir)); + m_strcpy(LastDir, sizeof(LastDir), LastDirBackup); }