X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=a9437dd0d68702eda99c2897dc05793599903912;hp=2046a37e2bdac80f06a649ea6033de9c9eb7d1fc;hb=6ebff74ad242d4c56fb7762965b19cee14fd2daa;hpb=ee1d4d931ca3ebec494694b74a1868a7a2e631e3 diff --git a/browser.c b/browser.c index 2046a37..a9437dd 100644 --- a/browser.c +++ b/browser.c @@ -7,44 +7,35 @@ * 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 "mutt.h" -#include "mutt_curses.h" -#include "mutt_menu.h" #include "buffy.h" -#include "mapping.h" #include "sort.h" #include "browser.h" -#ifdef USE_IMAP -#include "imap.h" -#endif +#include "attach.h" + +#include #ifdef USE_NNTP -#include "nntp.h" +#include #endif -#include "sidebar.h" - -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.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} + {NULL, OP_NULL} }; #ifdef USE_NNTP @@ -56,7 +47,7 @@ static struct mapping_t FolderNewsHelp[] = { {N_("Catchup"), OP_CATCHUP}, {N_("Mask"), OP_ENTER_MASK}, {N_("Help"), OP_HELP}, - {NULL} + {NULL, OP_NULL} }; #endif @@ -74,14 +65,12 @@ static void destroy_state (struct browser_state *state) int c; for (c = 0; c < state->entrylen; c++) { - FREE (&((state->entry)[c].name)); - FREE (&((state->entry)[c].desc)); - FREE (&((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 - FREE (&state->folder); -#endif - FREE (&state->entry); + p_delete(&state->folder); + p_delete(&state->entry); } static int browser_compare_subject (const void *a, const void *b) @@ -89,7 +78,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 = safe_strcoll (pa->name, pb->name); + int r = strcoll(NONULL(pa->name), NONULL(pb->name)); return ((BrowserSort & SORT_REVERSE) ? -r : r); } @@ -148,7 +137,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)); @@ -156,14 +145,14 @@ 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, unsigned long data, format_flag flags) { - char fn[SHORT_STRING], tmp[SHORT_STRING], permission[11]; - char date[16], *t_fmt; + char fn[SHORT_STRING], tmp[SHORT_STRING], permission[11], date[16]; + const char *t_fmt; time_t tnow; FOLDER *folder = (FOLDER *) data; struct passwd *pw; @@ -192,13 +181,11 @@ static const char *folder_format_str (char *dest, size_t destlen, char op, case 'f': { - char *s; + 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, @@ -233,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", @@ -241,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; @@ -269,8 +254,7 @@ static const char *folder_format_str (char *dest, size_t destlen, char op, break; case 'N': -#ifdef USE_IMAP - if (mx_is_imap (folder->ff->desc)) { + if (imap_is_magic (folder->ff->desc, NULL) == M_IMAP) { if (!optional) { snprintf (tmp, sizeof (tmp), "%%%sd", fmt); snprintf (dest, destlen, tmp, folder->ff->new); @@ -279,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; @@ -326,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, @@ -343,7 +326,7 @@ static const char *newsgroup_format_str (char *dest, size_t destlen, char op, break; case 'f': - strncpy (fn, folder->ff->name, sizeof (fn) - 1); + m_strcpy(fn, sizeof(fn), folder->ff->name); snprintf (tmp, sizeof (tmp), "%%%ss", fmt); snprintf (dest, destlen, tmp, fn); break; @@ -416,35 +399,35 @@ static const char *newsgroup_format_str (char *dest, size_t destlen, char op, } #endif /* USE_NNTP */ +#ifdef USE_NNTP static void add_folder (MUTTMENU * m, struct browser_state *state, const char *name, const struct stat *s, void *data, int new) +#else +static void add_folder (MUTTMENU * m, struct browser_state *state, + const char *name, const struct stat *s, + int new) +#endif { if (state->entrylen == state->entrymax) { /* need to allocate more space */ - safe_realloc (&state->entry, - sizeof (struct folder_file) * (state->entrymax += 256)); - memset (&state->entry[state->entrylen], 0, - sizeof (struct folder_file) * 256); + p_realloc(&state->entry, state->entrymax += 256); + p_clear(&state->entry[state->entrylen], 256); if (m) m->data = state->entry; } if (s != NULL) { - (state->entry)[state->entrylen].mode = s->st_mode; + (state->entry)[state->entrylen].mode = s->st_mode; (state->entry)[state->entrylen].mtime = s->st_mtime; - (state->entry)[state->entrylen].size = s->st_size; - - (state->entry)[state->entrylen].st = safe_malloc (sizeof (struct stat)); - memcpy ((state->entry)[state->entrylen].st, s, sizeof (struct stat)); + (state->entry)[state->entrylen].size = s->st_size; + (state->entry)[state->entrylen].st = p_dup(s, 1); } (state->entry)[state->entrylen].new = new; - (state->entry)[state->entrylen].name = safe_strdup (name); - (state->entry)[state->entrylen].desc = safe_strdup (name); -#ifdef USE_IMAP + (state->entry)[state->entrylen].name = m_strdup(name); + (state->entry)[state->entrylen].desc = m_strdup(name); (state->entry)[state->entrylen].imap = 0; -#endif #ifdef USE_NNTP if (option (OPTNEWS)) (state->entry)[state->entrylen].nd = (NNTP_DATA *) data; @@ -456,12 +439,8 @@ static void init_state (struct browser_state *state, MUTTMENU * menu) { state->entrylen = 0; state->entrymax = 256; - state->entry = - (struct folder_file *) safe_calloc (state->entrymax, - sizeof (struct folder_file)); -#ifdef USE_IMAP + state->entry = p_new(struct folder_file, state->entrymax); state->imap_browse = 0; -#endif if (menu) menu->data = state->entry; } @@ -472,23 +451,29 @@ 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; -/* mutt_buffy_check (0); */ +/* 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, - safe_strlen (prefix)) != 0) + m_strlen(prefix)) != 0) continue; if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.not)) 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 (); } else #endif /* USE_NNTP */ @@ -518,7 +503,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state, return (-1); } - mutt_buffy_check (0); + buffy_check (0); if ((dp = opendir (d)) == NULL) { mutt_perror (d); @@ -528,16 +513,16 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state, init_state (state, menu); while ((de = readdir (dp)) != NULL) { - if (safe_strcmp (de->d_name, ".") == 0) + if (m_strcmp(de->d_name, ".") == 0) continue; /* we don't need . */ if (prefix && *prefix - && safe_strncmp (prefix, de->d_name, safe_strlen (prefix)) != 0) + && m_strncmp(prefix, de->d_name, m_strlen(prefix)) != 0) continue; if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.not)) continue; - mutt_concat_path (buffer, d, de->d_name, sizeof (buffer)); + mutt_concat_path(buffer, sizeof(buffer), d, de->d_name); if (lstat (buffer, &s) == -1) continue; @@ -546,11 +531,15 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state, continue; i = buffy_lookup (buffer); - add_folder (menu, state, de->d_name, &s, NULL, i >= 0 ? ((BUFFY*) Incoming->data[i])->new : 0); +#ifdef USE_NNTP + 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 ? Incoming.arr[i]->new : 0); +#endif } closedir (dp); } - sidebar_draw (CurrentMenu); + sidebar_draw (); browser_sort (state); return 0; } @@ -563,22 +552,22 @@ 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; -/* mutt_buffy_check (0); */ +/* buffy_check (0); */ init_state (state, menu); for (tmp = news->list; tmp; tmp = tmp->next) { - if ((data = (NNTP_DATA *) tmp->data) != NULL && (data->new || - (data->subscribed - && - (!option - (OPTSHOWONLYUNREAD) - || data->unread)))) + 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); } + sidebar_draw (); } else #endif @@ -586,28 +575,33 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state) int i = 0; BUFFY* tmp; - if (!Incoming) + if (!Incoming.len) return (-1); - mutt_buffy_check (0); + buffy_check (0); init_state (state, menu); - for (i = 0; i < Incoming->length; i++) { - tmp = (BUFFY*) Incoming->data[i]; -#ifdef USE_IMAP - if (mx_is_imap (tmp->path)) { + 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 add_folder (menu, state, tmp->path, NULL, NULL, tmp->new); +#else + add_folder (menu, state, tmp->path, NULL, tmp->new); +#endif continue; } -#endif -#ifdef USE_POP - if (mx_is_pop (tmp->path)) { + if (tmp->magic == M_POP) { +#ifdef USE_NNTP add_folder (menu, state, tmp->path, NULL, NULL, tmp->new); +#else + add_folder (menu, state, tmp->path, NULL, tmp->new); +#endif continue; } -#endif #ifdef USE_NNTP - if (mx_is_nntp (tmp->path)) { + if (tmp->magic == M_NNTP) { add_folder (menu, state, tmp->path, NULL, NULL, tmp->new); continue; } @@ -619,10 +613,14 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state) (!S_ISLNK (s.st_mode))) continue; - strfcpy (buffer, NONULL (tmp->path), sizeof (buffer)); + m_strcpy(buffer, sizeof(buffer), NONULL(tmp->path)); mutt_pretty_mailbox (buffer); +#ifdef USE_NNTP add_folder (menu, state, buffer, &s, NULL, tmp->new); +#else + add_folder (menu, state, buffer, &s, tmp->new); +#endif } } browser_sort (state); @@ -640,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; @@ -658,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]; @@ -684,16 +682,14 @@ static void init_menu (struct browser_state *state, MUTTMENU * menu, else #endif if (buffy) - snprintf (title, titlelen, _("Mailboxes [%d]"), mutt_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)); } @@ -718,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]; @@ -735,17 +731,17 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, buffy = buffy && folder; - memset (&state, 0, sizeof (struct browser_state)); + p_clear(&state, 1); if (!folder) - strfcpy (LastDirBackup, LastDir, sizeof (LastDirBackup)); + m_strcpy(LastDirBackup, sizeof(LastDirBackup), LastDir); #ifdef USE_NNTP if (option (OPTNEWS)) { if (*f) - strfcpy (prefix, f, sizeof (prefix)); + 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; @@ -763,27 +759,23 @@ 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 (mx_is_imap (f)) { + if (imap_is_magic (f, NULL) == M_IMAP) { init_state (&state, NULL); state.imap_browse = 1; - imap_browse (f, &state); - strfcpy (LastDir, state.folder, sizeof (LastDir)); + if (!imap_browse (f, &state)) + m_strcpy(LastDir, sizeof(LastDir), state.folder); } else { -#endif - for (i = safe_strlen (f) - 1; i > 0 && f[i] != '/'; i--); + 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)); - safe_strcat (LastDir, sizeof (LastDir), "/"); - safe_strncat (LastDir, sizeof (LastDir), f, i); + getcwd(LastDir, sizeof(LastDir)); + m_strcat(LastDir, sizeof(LastDir), "/"); + m_strncat(LastDir, sizeof(LastDir), f, i); } } else { @@ -794,27 +786,24 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, } 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 && mx_is_imap (LastDir)) { + 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; @@ -824,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; @@ -847,7 +834,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, init_menu (&state, menu, title, sizeof (title), buffy); - FOREVER { + for (;;) { switch (i = mutt_menuLoop (menu)) { case OP_GENERIC_SELECT_ENTRY: @@ -860,36 +847,30 @@ 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 (safe_strcmp (state.entry[menu->current].name, "..") == 0) { - if (safe_strcmp ("..", LastDir + safe_strlen (LastDir) - 2) == 0) + if (m_strcmp(state.entry[menu->current].name, "..") == 0) { + if (m_strcmp("..", LastDir + m_strlen(LastDir) - 2) == 0) strcat (LastDir, "/.."); /* __STRCAT_CHECKED__ */ else { char *p = strrchr (LastDir + 1, '/'); @@ -905,36 +886,34 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, } } 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 = safe_strlen (LastDir) + 1; + n = m_strlen(LastDir) + 1; /* special case "" needs no delimiter */ 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); @@ -943,20 +922,19 @@ 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; imap_browse (LastDir, &state); + browser_sort (&state); 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(Homedir)); goto bail; } } @@ -973,15 +951,13 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, if (buffy) #endif { - strfcpy (f, state.entry[menu->current].name, flen); + 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 */ @@ -989,28 +965,29 @@ 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 = safe_calloc (*numfiles, sizeof (char *)); - for (i = 0, j = 0; i < state.entrylen; i++) { + tfiles = p_new(char *, *numfiles); + 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++] = safe_strdup (full); + tfiles[j++] = m_strdup(full); } } *files = tfiles; } else if (f[0]) { /* no tagged entries. return selected entry */ *numfiles = 1; - tfiles = safe_calloc (*numfiles, sizeof (char *)); + tfiles = p_new(char *, *numfiles); mutt_expand_path (f, flen); - tfiles[0] = safe_strdup (f); + tfiles[0] = m_strdup(f); *files = tfiles; } } @@ -1024,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); @@ -1046,6 +1022,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, init_state (&state, NULL); state.imap_browse = 1; imap_browse (LastDir, &state); + browser_sort (&state); menu->data = state.entry; menu->current = 0; menu->top = 0; @@ -1065,6 +1042,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, init_state (&state, NULL); state.imap_browse = 1; imap_browse (LastDir, &state); + browser_sort (&state); menu->data = state.entry; menu->current = 0; menu->top = 0; @@ -1088,8 +1066,8 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, if (mutt_yesorno (msg, M_NO) == M_YES) { if (!imap_delete_mailbox (Context, mx)) { /* free the mailbox from the browser */ - FREE (&((state.entry)[nentry].name)); - FREE (&((state.entry)[nentry].desc)); + p_delete(&((state.entry)[nentry].name)); + p_delete(&((state.entry)[nentry].desc)); /* and move all other entries up */ if (nentry + 1 < state.entrylen) memmove (state.entry + nentry, state.entry + nentry + 1, @@ -1104,10 +1082,9 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, } else mutt_message _("Mailbox not deleted."); - FREE (&mx.mbox); + p_delete(&mx.mbox); } break; -#endif case OP_CHANGE_DIRECTORY: @@ -1116,15 +1093,13 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, 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 = safe_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] = '/'; } @@ -1132,25 +1107,24 @@ 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 (mx_is_imap (buf)) { - strfcpy (LastDir, buf, sizeof (LastDir)); + if (imap_is_magic (buf, NULL) == M_IMAP) { + m_strcpy(LastDir, sizeof(LastDir), buf); destroy_state (&state); init_state (&state, NULL); state.imap_browse = 1; imap_browse (LastDir, &state); + browser_sort (&state); menu->data = state.entry; menu->current = 0; menu->top = 0; 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."); @@ -1174,47 +1148,45 @@ 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 = (regex_t *) safe_malloc (sizeof (regex_t)); + regex_t *rx = p_new(regex_t, 1); char *s = buf; int not = 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); + s = vskipspaces(s + 1); not = 1; } if ((err = REGCOMP (rx, s, REG_NOSUB)) != 0) { regerror (err, rx, buf, sizeof (buf)); regfree (rx); - FREE (&rx); + p_delete(&rx); mutt_error ("%s", buf); } else { - str_replace (&Mask.pattern, buf); + m_strreplace(&Mask.pattern, buf); regfree (Mask.rx); - FREE (&Mask.rx); + p_delete(&Mask.rx); Mask.rx = rx; Mask.not = not; destroy_state (&state); -#ifdef USE_IMAP if (state.imap_browse) { init_state (&state, NULL); state.imap_browse = 1; imap_browse (LastDir, &state); + browser_sort (&state); menu->data = state.entry; 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 { @@ -1289,21 +1261,22 @@ 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 (mx_is_imap (LastDir)) { + else if (imap_is_magic (LastDir, NULL) == M_IMAP) { init_state (&state, NULL); state.imap_browse = 1; imap_browse (LastDir, &state); + 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); break; case OP_BUFFY_LIST: - mutt_buffy_list (); + if (option (OPTFORCEBUFFYCHECK)) + buffy_check (1); + buffy_list (); break; case OP_BROWSER_NEW_FILE: @@ -1311,7 +1284,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; @@ -1326,15 +1299,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))) { @@ -1344,14 +1315,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 @@ -1363,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; - FREE (&f->desc); - mutt_FormatString (buffer, sizeof (buffer), NONULL(GroupFormat), - newsgroup_format_str, (unsigned long) &folder, - M_FORMAT_ARROWCURSOR); - f->desc = safe_strdup (buffer); */ if (menu->current + 1 < menu->max) menu->current++; menu->redraw = REDRAW_MOTION_RESYNCH; @@ -1398,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) { @@ -1417,15 +1374,13 @@ 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: if (option (OPTNEWS)) { - regex_t *rx = (regex_t *) safe_malloc (sizeof (regex_t)); + regex_t *rx = p_new(regex_t, 1); char *s = buf; int j = menu->current; NNTP_DATA *nd; @@ -1441,14 +1396,14 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, else snprintf (tmp, sizeof (tmp), _("Unsubscribe pattern: ")); if (mutt_get_field (tmp, buf, sizeof (buf), 0) != 0 || !buf[0]) { - FREE (&rx); + p_delete(&rx); break; } if ((err = REGCOMP (rx, s, REG_NOSUB)) != 0) { regerror (err, rx, buf, sizeof (buf)); regfree (rx); - FREE (&rx); + p_delete(&rx); mutt_error ("%s", buf); break; } @@ -1462,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; - FREE (&f->desc); - mutt_FormatString (buffer, sizeof (buffer), NONULL(GroupFormat), - newsgroup_format_str, (unsigned long) &folder, - M_FORMAT_ARROWCURSOR); - f->desc = safe_strdup (buffer); - } */ + nd = mutt_newsgroup_unsubscribe (news, folderf->name); } if (i == OP_BROWSER_SUBSCRIBE || i == OP_BROWSER_UNSUBSCRIBE) { if (menu->current + 1 < menu->max) @@ -1494,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; @@ -1513,26 +1453,22 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, nntp_clear_cacheindex (news); if (i != OP_BROWSER_SUBSCRIBE && i != OP_BROWSER_UNSUBSCRIBE) regfree (rx); - FREE (&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 */ } } bail: if (!folder) - strfcpy (LastDir, LastDirBackup, sizeof (LastDir)); + m_strcpy(LastDir, sizeof(LastDir), LastDirBackup); }