A first take at corrected mh/maildir support.

1 files changed, 5 insertions, 16 deletions

diff --git a/buffy.c b/buffy.c
index 98c1a0ef..d74e6cb1 100644
--- a/buffy.c
+++ b/buffy.c
@@ -220,7 +220,6 @@ int mutt_buffy_check (int force)
   DIR *dirp;
   char path[_POSIX_PATH_MAX];
   struct stat contex_sb;
-  int res;
   time_t t;
 
   /* fastest return if there are no mailboxes */
@@ -293,8 +292,12 @@ int mutt_buffy_check (int force)
 	break;
 
       case M_MAILDIR:
+      case M_MH:
 
-	snprintf (path, sizeof (path), "%s/new", tmp->path);
+	if(tmp->magic == M_MAILDIR)
+	  snprintf (path, sizeof (path), "%s/new", tmp->path);
+	else
+	  strfcpy (path, tmp->path, sizeof(path));
 	if ((dirp = opendir (path)) == NULL)
 	{
 	  tmp->magic = 0;
@@ -313,20 +316,6 @@ int mutt_buffy_check (int force)
 	closedir (dirp);
 	break;
 
-      case M_MH:
-
-	res = mh_parse_sequences (NULL, tmp->path);
-	if (res >= 0)
-	{
-	  BuffyCount += res;
-	  tmp->new = res;
-	}
-	else
-	{
-	  tmp->magic = 0;
-	}
-	break;
-
 #ifdef USE_IMAP
       case M_IMAP:
 	if (imap_buffy_check (tmp->path) > 0)