Rocco Rutte:

[apps/madmutt.git] / browser.c

diff --git a/browser.c b/browser.c
index 587fb6b..bb687c6 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -17,10 +17,10 @@
 #include "buffy.h"
 #include "mapping.h"
 #include "sort.h"
-#include "mailbox.h"
 #include "browser.h"
 #ifdef USE_IMAP
 #include "imap.h"
+#include "imap/mx_imap.h"
 #endif
 #ifdef USE_NNTP
 #include "nntp.h"
@@ -30,6 +30,7 @@
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
+#include "lib/list.h"
 
 #include <stdlib.h>
 #include <dirent.h>
@@ -89,7 +90,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 = mutt_strcoll (pa->name, pb->name);
+  int r = safe_strcoll (pa->name, pb->name);
 
   return ((BrowserSort & SORT_REVERSE) ? -r : r);
 }
@@ -270,7 +271,7 @@ static const char *folder_format_str (char *dest, size_t destlen, char op,
 
   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);
@@ -483,7 +484,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
       if (!(data = (NNTP_DATA *) tmp->data))
         continue;
       if (prefix && *prefix && strncmp (prefix, data->group,
-                                        mutt_strlen (prefix)) != 0)
+                                        safe_strlen (prefix)) != 0)
         continue;
       if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.not))
         continue;
@@ -497,7 +498,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
     DIR *dp;
     struct dirent *de;
     char buffer[_POSIX_PATH_MAX + SHORT_STRING];
-    BUFFY *tmp;
+    int i = -1;
 
     while (stat (d, &s) == -1) {
       if (errno == ENOENT) {
@@ -528,11 +529,11 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
     init_state (state, menu);
 
     while ((de = readdir (dp)) != NULL) {
-      if (mutt_strcmp (de->d_name, ".") == 0)
+      if (safe_strcmp (de->d_name, ".") == 0)
         continue;               /* we don't need . */
 
       if (prefix && *prefix
-          && mutt_strncmp (prefix, de->d_name, mutt_strlen (prefix)) != 0)
+          && safe_strncmp (prefix, de->d_name, safe_strlen (prefix)) != 0)
         continue;
       if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.not))
         continue;
@@ -545,14 +546,12 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
           (!S_ISLNK (s.st_mode)))
         continue;
 
-      tmp = Incoming;
-      while (tmp && mutt_strcmp (buffer, tmp->path))
-        tmp = tmp->next;
-      add_folder (menu, state, de->d_name, &s, NULL, (tmp) ? tmp->new : 0);
+      i = buffy_lookup (buffer);
+      add_folder (menu, state, de->d_name, &s, NULL, i >= 0 ? ((BUFFY*) Incoming->data[i])->new : 0);
     }
     closedir (dp);
   }
-  draw_sidebar (CurrentMenu);
+  sidebar_draw (CurrentMenu);
   browser_sort (state);
   return 0;
 }
@@ -585,7 +584,8 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state)
   else
 #endif
   {
-    BUFFY *tmp = Incoming;
+    int i = 0;
+    BUFFY* tmp;
 
     if (!Incoming)
       return (-1);
@@ -593,21 +593,23 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state)
 
     init_state (state, menu);
 
-    do {
+    for (i = 0; i < Incoming->length; i++) {
+      tmp = (BUFFY*) Incoming->data[i];
+      tmp->magic = mx_get_magic (tmp->path);
 #ifdef USE_IMAP
-      if (mx_is_imap (tmp->path)) {
+      if (tmp->magic == M_IMAP) {
         add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
         continue;
       }
 #endif
 #ifdef USE_POP
-      if (mx_is_pop (tmp->path)) {
+      if (tmp->magic == M_POP) {
         add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
         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;
       }
@@ -624,7 +626,6 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state)
 
       add_folder (menu, state, buffer, &s, NULL, tmp->new);
     }
-    while ((tmp = tmp->next));
   }
   browser_sort (state);
   return 0;
@@ -765,7 +766,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
   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);
@@ -773,7 +774,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
     }
     else {
 #endif
-      for (i = mutt_strlen (f) - 1; i > 0 && f[i] != '/'; i--);
+      for (i = safe_strlen (f) - 1; i > 0 && f[i] != '/'; i--);
       if (i > 0) {
         if (f[0] == '/') {
           if (i > sizeof (LastDir) - 1)
@@ -810,7 +811,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
       strfcpy (LastDir, NONULL (Maildir), sizeof (LastDir));
 
 #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);
@@ -889,8 +890,8 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
           /* save the old directory */
           strfcpy (OldLastDir, LastDir, sizeof (OldLastDir));
 
-          if (mutt_strcmp (state.entry[menu->current].name, "..") == 0) {
-            if (mutt_strcmp ("..", LastDir + mutt_strlen (LastDir) - 2) == 0)
+          if (safe_strcmp (state.entry[menu->current].name, "..") == 0) {
+            if (safe_strcmp ("..", LastDir + safe_strlen (LastDir) - 2) == 0)
               strcat (LastDir, "/..");  /* __STRCAT_CHECKED__ */
             else {
               char *p = strrchr (LastDir + 1, '/');
@@ -918,7 +919,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
             strfcpy (LastDir, state.entry[menu->current].name,
                      sizeof (LastDir));
             /* tack on delimiter here */
-            n = mutt_strlen (LastDir) + 1;
+            n = safe_strlen (LastDir) + 1;
 
             /* special case "" needs no delimiter */
             url_parse_ciss (&url, state.entry[menu->current].name);
@@ -1123,7 +1124,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
 #endif
       {
         /* add '/' at the end of the directory name if not already there */
-        int len = mutt_strlen (LastDir);
+        int len = safe_strlen (LastDir);
 
         if (len && LastDir[len - 1] != '/' && sizeof (buf) > len)
           buf[len] = '/';
@@ -1134,7 +1135,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
         buffy = 0;
         mutt_expand_path (buf, sizeof (buf));
 #ifdef USE_IMAP
-        if (mx_is_imap (buf)) {
+        if (imap_is_magic (buf, NULL) == M_IMAP) {
           strfcpy (LastDir, buf, sizeof (LastDir));
           destroy_state (&state);
           init_state (&state, NULL);
@@ -1199,7 +1200,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
           mutt_error ("%s", buf);
         }
         else {
-          mutt_str_replace (&Mask.pattern, buf);
+          str_replace (&Mask.pattern, buf);
           regfree (Mask.rx);
           FREE (&Mask.rx);
           Mask.rx = rx;
@@ -1291,7 +1292,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
           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);