X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=f001c3dbcb43abce7ccfa04f88099b5dbf22a766;hp=443283d47286bb5be8149e8eec6e225dedfbbd5e;hb=193714be08fc91ae77ddd401c1273d1b0d42845d;hpb=b8c71f93b0296f815a6538182343ba67e88c0012

diff --git a/browser.c b/browser.c
index 443283d..f001c3d 100644
--- a/browser.c
+++ b/browser.c
@@ -7,63 +7,28 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
+
+#include <dirent.h>
+#include <pwd.h>
+#include <grp.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-ui/lib-ui.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+#include <lib-ui/sidebar.h>
+#include <lib-mx/mx.h>
 
 #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"
 
 #include <imap/imap.h>
-#include <imap/mx_imap.h>
 #ifdef USE_NNTP
 #include "nntp.h"
 #endif
-#include "sidebar.h"
-
-#include "lib/list.h"
-
-#include <stdlib.h>
-#include <dirent.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-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
 
 typedef struct folder_t {
   struct folder_file *ff;
@@ -76,12 +41,12 @@ 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));
+    p_delete(&state->entry[c].name);
+    p_delete(&state->entry[c].desc);
+    p_delete(&state->entry[c].st);
   }
   p_delete(&state->folder);
   p_delete(&state->entry);
@@ -159,16 +124,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);
@@ -198,9 +163,9 @@ static const char *folder_format_str (char *dest, size_t destlen, char op,
       const char *s;
 
       if (folder->ff->imap)
-        s = NONULL (folder->ff->desc);
+        s = NONULL(folder->ff->desc);
       else
-        s = NONULL (folder->ff->name);
+        s = NONULL(folder->ff->name);
 
       snprintf (fn, sizeof (fn), "%s%s", s,
                 folder->ff->st ? (S_ISLNK (folder->ff->st->st_mode) ? "@" :
@@ -214,9 +179,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) !=
@@ -314,24 +278,23 @@ 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);
+  if (flags & M_FORMAT_OPTIONAL)
+    m_strformat(dest, destlen, 0, optional ? ifstr : elstr,
+                folder_format_str, data, 0);
+
+  return src;
 }
 
 #ifdef USE_NNTP
-static const char *newsgroup_format_str (char *dest, 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 *
+newsgroup_format_str(char *dest, ssize_t destlen, char op,
+                     const char *src, const char *fmt,
+                     const char *ifstr, const char *elstr,
+                     anytype data, format_flag flags)
 {
-  char fn[SHORT_STRING], tmp[SHORT_STRING];
-  FOLDER *folder = (FOLDER *) data;
+  char fn[STRING], tmp[STRING];
+  FOLDER *folder = data.ptr;
 
   switch (op) {
   case 'C':
@@ -364,11 +327,11 @@ static const char *newsgroup_format_str (char *dest, size_t destlen, char op,
   case 's':
     if (flags & M_FORMAT_OPTIONAL) {
       if (folder->ff->nd->unread != 0)
-        mutt_FormatString (dest, destlen, ifstring, newsgroup_format_str,
-                           data, flags);
+        m_strformat(dest, destlen, 0, ifstr, newsgroup_format_str,
+                    data, flags);
       else
-        mutt_FormatString (dest, destlen, elsestring, newsgroup_format_str,
-                           data, flags);
+        m_strformat (dest, destlen, 0, elstr, newsgroup_format_str,
+                     data, flags);
     }
     else if (Context && Context->data == folder->ff->nd) {
       snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
@@ -386,11 +349,11 @@ static const char *newsgroup_format_str (char *dest, size_t destlen, char op,
       snprintf (dest, destlen, tmp, Context->new);
     }
     else if (option (OPTMARKOLD) &&
-             folder->ff->nd->lastCached >= folder->ff->nd->firstMessage &&
-             folder->ff->nd->lastCached <= folder->ff->nd->lastMessage) {
+             folder->ff->nd->lastCached >= folder->ff->nd->first &&
+             folder->ff->nd->lastCached <= folder->ff->nd->last) {
       snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
       snprintf (dest, destlen, tmp,
-                folder->ff->nd->lastMessage - folder->ff->nd->lastCached);
+                folder->ff->nd->last - folder->ff->nd->lastCached);
     }
     else {
       snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
@@ -444,7 +407,7 @@ static void add_folder (MUTTMENU * m, struct browser_state *state,
   (state->entry)[state->entrylen].imap = 0;
 #ifdef USE_NNTP
   if (option (OPTNEWS))
-    (state->entry)[state->entrylen].nd = (NNTP_DATA *) data;
+    (state->entry)[state->entrylen].nd = data;
 #endif
   (state->entrylen)++;
 }
@@ -465,29 +428,21 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
 {
 #ifdef USE_NNTP
   if (option (OPTNEWS)) {
-    LIST *tmp;
-    NNTP_DATA *data;
-    NNTP_SERVER *news = CurrentNewsSrv;
+    nntp_data_t *data;
+    nntp_server_t *news = CurrentNewsSrv;
 
 /*  buffy_check (0); */
     init_state (state, menu);
 
-    for (tmp = news->list; tmp; tmp = tmp->next) {
-      if (!(data = (NNTP_DATA *) tmp->data))
+    for (data = news->list; data; data = data->next) {
+      nntp_sync_sidebar(data);
+      if (m_strncmp (prefix, data->group, m_strlen(prefix)) != 0)
         continue;
-      nntp_sync_sidebar (data);
-      if (prefix && *prefix && strncmp (prefix, data->group,
-                                        m_strlen(prefix)) != 0)
+      if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.neg))
         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);
+    sidebar_draw ();
   }
   else
 #endif /* USE_NNTP */
@@ -495,7 +450,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
     struct stat s;
     DIR *dp;
     struct dirent *de;
-    char buffer[_POSIX_PATH_MAX + SHORT_STRING];
+    char buffer[_POSIX_PATH_MAX + STRING];
     int i = -1;
 
     while (stat (d, &s) == -1) {
@@ -530,10 +485,9 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
       if (m_strcmp(de->d_name, ".") == 0)
         continue;               /* we don't need . */
 
-      if (prefix && *prefix
-          && m_strncmp(prefix, de->d_name, m_strlen(prefix)) != 0)
+      if (m_strncmp(prefix, de->d_name, m_strlen(prefix)) != 0)
         continue;
-      if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.not))
+      if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.neg))
         continue;
 
       mutt_concat_path(buffer, sizeof(buffer), d, de->d_name);
@@ -546,14 +500,14 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
 
       i = buffy_lookup (buffer);
 #ifdef USE_NNTP
-      add_folder (menu, state, de->d_name, &s, NULL, i >= 0 ? ((BUFFY*) Incoming->data[i])->new : 0);
+      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 ? ((BUFFY*) Incoming->data[i])->new : 0);
+      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;
 }
@@ -566,37 +520,34 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state)
 
 #ifdef USE_NNTP
   if (option (OPTNEWS)) {
-    LIST *tmp;
-    NNTP_DATA *data;
-    NNTP_SERVER *news = CurrentNewsSrv;
+    nntp_data_t *data;
+    nntp_server_t *news = CurrentNewsSrv;
 
 /*  buffy_check (0); */
     init_state (state, menu);
 
-    for (tmp = news->list; tmp; tmp = tmp->next) {
-      if ((data = (NNTP_DATA*) tmp->data) == NULL)
-        continue;
+    for (data = news->list; data; data = data->next) {
       nntp_sync_sidebar (data);
       if ((data->new || (data->subscribed && 
                          (!option (OPTSHOWONLYUNREAD)|| data->unread))))
         add_folder (menu, state, data->group, NULL, data, data->new);
     }
-    sidebar_draw (CurrentMenu);
+    sidebar_draw ();
   }
   else
 #endif
   {
-    unsigned int i = 0;
+    int i = 0;
     BUFFY* tmp;
 
-    if (!Incoming)
+    if (!Incoming.len)
       return (-1);
     buffy_check (0);
 
     init_state (state, menu);
 
-    for (i = 0; i < Incoming->length; i++) {
-      tmp = (BUFFY*) Incoming->data[i];
+    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
@@ -652,7 +603,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;
 
@@ -661,16 +612,16 @@ static void folder_entry (char *s, size_t slen, MUTTMENU * menu, int num)
 
 #ifdef USE_NNTP
   if (option (OPTNEWS))
-    mutt_FormatString (s, slen, NONULL (GroupFormat), newsgroup_format_str,
-                       (unsigned long) &folder, M_FORMAT_ARROWCURSOR);
+    m_strformat(s, slen, getmaxx(main_w), GroupFormat, newsgroup_format_str,
+                &folder, 0);
   else
 #endif
-    mutt_FormatString (s, slen, NONULL (FolderFormat), folder_format_str,
-                       (unsigned long) &folder, M_FORMAT_ARROWCURSOR);
+    m_strformat(s, slen, 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];
 
@@ -728,12 +679,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;
@@ -755,14 +705,12 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
     if (*f)
       m_strcpy(prefix, sizeof(prefix), f);
     else {
-      LIST *list;
+      nntp_data_t *list;
 
       /* default state for news reader mode is browse subscribed newsgroups */
       buffy = 0;
       for (list = CurrentNewsSrv->list; list; list = list->next) {
-        NNTP_DATA *data = (NNTP_DATA *) list->data;
-
-        if (data && data->subscribed) {
+        if (list->subscribed) {
           buffy = 1;
           break;
         }
@@ -794,7 +742,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
       }
       else {
         if (f[0] == '/')
-          strcpy (LastDir, "/");        /* __STRCPY_CHECKED__ */
+          m_strcpy(LastDir, sizeof(LastDir), "/");
         else
           getcwd (LastDir, sizeof (LastDir));
       }
@@ -839,13 +787,6 @@ 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);
 
   for (;;) {
@@ -885,7 +826,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
 
           if (m_strcmp(state.entry[menu->current].name, "..") == 0) {
             if (m_strcmp("..", LastDir + m_strlen(LastDir) - 2) == 0)
-              strcat (LastDir, "/..");  /* __STRCAT_CHECKED__ */
+              m_strcat(LastDir, sizeof(LastDir), "/..");
             else {
               char *p = strrchr (LastDir + 1, '/');
 
@@ -895,7 +836,7 @@ 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), "/..");
               }
             }
           }
@@ -917,7 +858,7 @@ 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;
             }
@@ -948,7 +889,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
             /* try to restore the old values */
             m_strcpy(LastDir, sizeof(LastDir), OldLastDir);
             if (examine_directory (menu, &state, LastDir, prefix) == -1) {
-              m_strcpy(LastDir, sizeof(LastDir), NONULL(Homedir));
+              m_strcpy(LastDir, sizeof(LastDir), NONULL(mod_core.homedir));
               goto bail;
             }
           }
@@ -980,7 +921,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;
@@ -1070,7 +1011,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;
 
@@ -1111,9 +1052,9 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
       if (!state.imap_browse)
       {
         /* 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] = '/';
       }
 
@@ -1166,7 +1107,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
       if (mutt_get_field (_("File Mask: "), buf, sizeof (buf), 0) == 0) {
         regex_t *rx = p_new(regex_t, 1);
         char *s = buf;
-        int not = 0, err;
+        int neg = 0, err;
 
         buffy = 0;
         /* assume that the user wants to see everything */
@@ -1175,7 +1116,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
         s = vskipspaces(s);
         if (*s == '!') {
           s = vskipspaces(s + 1);
-          not = 1;
+          neg = 1;
         }
 
         if ((err = REGCOMP (rx, s, REG_NOSUB)) != 0) {
@@ -1189,7 +1130,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
           regfree (Mask.rx);
           p_delete(&Mask.rx);
           Mask.rx = rx;
-          Mask.not = not;
+          Mask.neg = neg;
 
           destroy_state (&state);
           if (state.imap_browse) {
@@ -1336,7 +1277,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
         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
@@ -1348,29 +1289,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];
-        NNTP_DATA *nd;
+        struct folder_file *folder_f = &state.entry[menu->current];
+        nntp_data_t *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;
-	    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;
@@ -1383,12 +1310,10 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
         break;
 
       {
-        LIST *tmp;
-        NNTP_DATA *data;
+        nntp_data_t *data;
 
-        for (tmp = CurrentNewsSrv->list; tmp; tmp = tmp->next) {
-          if ((data = (NNTP_DATA *) tmp->data))
-            data->deleted = 1;
+        for (data = CurrentNewsSrv->list; data; data = data->next) {
+          data->deleted = 1;
         }
       }
       nntp_get_active (CurrentNewsSrv);
@@ -1411,8 +1336,8 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
         regex_t *rx = p_new(regex_t, 1);
         char *s = buf;
         int j = menu->current;
-        NNTP_DATA *nd;
-        NNTP_SERVER *news = CurrentNewsSrv;
+        nntp_data_t *nd;
+        nntp_server_t *news = CurrentNewsSrv;
 
         if (i == OP_SUBSCRIBE_PATTERN || i == OP_UNSUBSCRIBE_PATTERN) {
           char tmp[STRING];
@@ -1445,29 +1370,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;
-		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);
-	      } */
+              nd = mutt_newsgroup_unsubscribe (news, folderf->name);
           }
           if (i == OP_BROWSER_SUBSCRIBE || i == OP_BROWSER_UNSUBSCRIBE) {
             if (menu->current + 1 < menu->max)
@@ -1477,13 +1387,9 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
           }
         }
         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) {
+          nd = news ? news->list : NULL;
+          for (; nd; nd = nd->next) {
+            if (nd->group && !nd->subscribed) {
               if (regexec (rx, nd->group, 0, NULL, 0) == 0) {
                 mutt_newsgroup_subscribe (news, nd->group);
                 add_folder (menu, &state, nd->group, NULL, nd, nd->new);
@@ -1493,7 +1399,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
           init_menu (&state, menu, title, sizeof (title), buffy);
         }
         mutt_newsrc_update (news);
-        nntp_clear_cacheindex (news);
         if (i != OP_BROWSER_SUBSCRIBE && i != OP_BROWSER_UNSUBSCRIBE)
           regfree (rx);
         p_delete(&rx);