X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=69351d08aa613e789f93960f4ecfb5c20701901a;hp=0e300003d8ff9df512d0705197ded47ce33290c4;hb=29bfa77fef6bf9c0bba878257fc837b2e75f8256;hpb=0ac011f8eb41bab7808881ebf9802b4eb252fe3b diff --git a/browser.c b/browser.c index 0e30000..69351d0 100644 --- a/browser.c +++ b/browser.c @@ -17,20 +17,19 @@ #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 +#include #ifdef USE_NNTP #include "nntp.h" #endif @@ -78,16 +77,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 +160,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 +198,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 +235,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 +242,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 +269,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 +278,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 +324,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 +442,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 +455,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 +466,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; @@ -580,7 +567,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; @@ -612,7 +599,6 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state) 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) { #ifdef USE_NNTP add_folder (menu, state, tmp->path, NULL, NULL, tmp->new); @@ -621,7 +607,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 +653,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 +671,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 +701,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 +729,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 +756,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 +774,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 +781,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 +805,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 +813,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 +828,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 +862,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 +905,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 +918,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 +937,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 +945,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 +969,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 +981,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 +1016,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 +1100,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 +1109,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 +1122,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 +1135,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 +1193,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 +1202,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 +1276,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 +1283,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 +1314,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 +1321,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))) { @@ -1433,7 +1384,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 +1403,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: @@ -1529,7 +1478,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 +1499,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 */ } }