X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=69351d08aa613e789f93960f4ecfb5c20701901a;hp=53bab1aee44750417dfefedb54ee35fe7550f83e;hb=29bfa77fef6bf9c0bba878257fc837b2e75f8256;hpb=c6b9d35ed9361e4defab9762a7480d5126405ae9

diff --git a/browser.c b/browser.c
index 53bab1a..69351d0 100644
--- a/browser.c
+++ b/browser.c
@@ -15,22 +15,21 @@
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
+#include <lib-lib/mapping.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
 
 #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
+#include <imap/imap.h>
+#include <imap/mx_imap.h>
 #ifdef USE_NNTP
 #include "nntp.h"
 #endif
@@ -85,9 +84,7 @@ static void destroy_state (struct browser_state *state)
     p_delete(&((state->entry)[c].desc));
     p_delete(&((state->entry)[c].st));
   }
-#ifdef USE_IMAP
   p_delete(&state->folder);
-#endif
   p_delete(&state->entry);
 }
 
@@ -96,7 +93,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);
 }
@@ -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,
@@ -423,9 +414,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 +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;
@@ -460,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;
 }
@@ -473,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;
 
@@ -489,7 +482,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);
   }
@@ -535,7 +532,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
         continue;               /* we don't need . */
 
       if (prefix && *prefix
-          && str_ncmp (prefix, de->d_name, m_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;
@@ -549,7 +546,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);
   }
@@ -566,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;
 
@@ -586,7 +587,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 +599,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);
@@ -623,10 +628,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);
@@ -644,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;
 
@@ -662,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];
 
@@ -688,16 +697,14 @@ static void init_menu (struct browser_state *state, MUTTMENU * menu,
   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));
   }
@@ -722,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];
@@ -742,14 +749,14 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
   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;
@@ -767,25 +774,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 (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] == '/') {
-          i = MIN(sizeof(LastDir) - 1, i);
+          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 {
@@ -796,28 +801,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 && 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 +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;
 
@@ -863,33 +862,27 @@ 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, 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 (m_strcmp(state.entry[menu->current].name, "..") == 0) {
             if (m_strcmp("..", LastDir + m_strlen(LastDir) - 2) == 0)
@@ -908,17 +901,16 @@ 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 = m_strlen(LastDir) + 1;
 
@@ -926,18 +918,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, sizeof(tmp), LastDir,
                              state.entry[menu->current].name);
-            strfcpy (LastDir, tmp, sizeof (LastDir));
+            m_strcpy(LastDir, sizeof(LastDir), tmp);
           }
 
           destroy_state (&state);
@@ -946,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;
@@ -955,12 +945,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(Homedir));
               goto bail;
             }
           }
@@ -977,13 +966,11 @@ 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, flen, LastDir, state.entry[menu->current].name);
 
@@ -993,12 +980,13 @@ 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];
 
@@ -1028,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);
@@ -1113,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:
 
@@ -1122,15 +1108,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 = 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] = '/';
       }
 
@@ -1138,9 +1122,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;
@@ -1152,12 +1135,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.");
 
@@ -1181,7 +1163,7 @@ 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;
@@ -1190,11 +1172,10 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
         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;
         }
 
@@ -1205,14 +1186,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 +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 {
@@ -1297,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;
@@ -1305,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);
@@ -1322,7 +1299,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;
@@ -1337,15 +1314,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))) {
@@ -1355,11 +1330,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);
@@ -1409,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) {
@@ -1428,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:
@@ -1505,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;
@@ -1526,24 +1499,20 @@ 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 */
     }
   }
 
 bail:
 
   if (!folder)
-    strfcpy (LastDir, LastDirBackup, sizeof (LastDir));
+    m_strcpy(LastDir, sizeof(LastDir), LastDirBackup);
 
 }