X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=443283d47286bb5be8149e8eec6e225dedfbbd5e;hp=c46c89ef1650d931c92a8960a7a9e58d30988fa8;hb=38c7d971a4e206284e06e958511bb55694cb4deb;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1 diff --git a/browser.c b/browser.c index c46c89e..443283d 100644 --- a/browser.c +++ b/browser.c @@ -15,6 +15,7 @@ #include #include #include +#include #include "mutt.h" #include "enter.h" @@ -22,15 +23,12 @@ #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 +#include +#include #ifdef USE_NNTP #include "nntp.h" #endif @@ -78,16 +76,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) { - int c; + unsigned 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); } @@ -201,11 +197,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 +234,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 +241,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 +268,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 +277,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; @@ -423,9 +413,15 @@ 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 */ @@ -445,9 +441,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; @@ -460,9 +454,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; } @@ -489,7 +481,11 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state, 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 (CurrentMenu); } @@ -549,7 +545,11 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state, continue; i = buffy_lookup (buffer); +#ifdef USE_NNTP add_folder (menu, state, de->d_name, &s, NULL, i >= 0 ? ((BUFFY*) Incoming->data[i])->new : 0); +#else + add_folder (menu, state, de->d_name, &s, i >= 0 ? ((BUFFY*) Incoming->data[i])->new : 0); +#endif } closedir (dp); } @@ -586,7 +586,7 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state) else #endif { - int i = 0; + unsigned int i = 0; BUFFY* tmp; if (!Incoming) @@ -598,18 +598,22 @@ 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); +#else + add_folder (menu, state, tmp->path, NULL, tmp->new); +#endif continue; } -#endif -#ifdef USE_POP 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 (tmp->magic == M_NNTP) { add_folder (menu, state, tmp->path, NULL, NULL, tmp->new); @@ -626,7 +630,11 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state) 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); @@ -692,12 +700,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)); } @@ -767,7 +773,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; @@ -775,11 +780,10 @@ 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] == '/') { - i = MIN(sizeof(LastDir) - 1, i); + i = MIN(ssizeof(LastDir) - 1, i); m_strcpy(LastDir, sizeof(LastDir), f); } else { @@ -800,9 +804,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) @@ -810,14 +812,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; @@ -827,9 +827,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; @@ -863,29 +861,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 */ @@ -912,7 +904,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; @@ -931,7 +922,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, LastDir[n - 1] = state.entry[menu->current].delim; } } -#endif else { char tmp[_POSIX_PATH_MAX]; @@ -946,7 +936,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; @@ -955,7 +944,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); @@ -980,10 +968,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); @@ -993,12 +979,13 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, if (multiple) { char **tfiles; - int i, j; + int j; + unsigned 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]; @@ -1028,7 +1015,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); @@ -1113,7 +1099,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, p_delete(&mx.mbox); } break; -#endif case OP_CHANGE_DIRECTORY: @@ -1123,12 +1108,10 @@ 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 */ - int len = m_strlen(LastDir); + size_t len = m_strlen(LastDir); if (len && LastDir[len - 1] != '/' && sizeof (buf) > len) buf[len] = '/'; @@ -1138,7 +1121,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); @@ -1152,7 +1134,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); @@ -1191,10 +1172,9 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, /* assume that the user wants to see everything */ if (!buf[0]) m_strcpy(buf, sizeof(buf), "."); - SKIPWS (s); + s = vskipspaces(s); if (*s == '!') { - s++; - SKIPWS (s); + s = vskipspaces(s + 1); not = 1; } @@ -1205,14 +1185,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; destroy_state (&state); -#ifdef USE_IMAP if (state.imap_browse) { init_state (&state, NULL); state.imap_browse = 1; @@ -1222,7 +1201,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 { @@ -1297,7 +1275,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; @@ -1305,7 +1282,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); @@ -1337,7 +1313,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); @@ -1345,7 +1320,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))) { @@ -1355,11 +1329,11 @@ 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, sizeof(buf), LastDir, + mutt_concat_path(nbuf, sizeof(nbuf), LastDir, state.entry[menu->current].name); - b = mutt_make_file_attach (buf); + b = mutt_make_file_attach (nbuf); if (b != NULL) { mutt_view_attachment (NULL, b, M_REGULAR, NULL, NULL, 0); mutt_free_body (&b); @@ -1428,10 +1402,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: @@ -1526,18 +1498,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 */ } }