(guess_level,list_copy): Fixed

(imap_parse): Handle NO case explicitely.

@@ -797,12 +797,17 @@ folder_imap_delete (mu_folder_t folder, const char *name)
 void
 void
 guess_level (struct mu_list_response *resp, size_t prefix_len)
 guess_level (struct mu_list_response *resp, size_t prefix_len)
 {
 {
-  char *p;
   size_t lev = 0;
   size_t lev = 0;
 
 
-  for (p = strchr (resp->name + prefix_len, resp->separator); p;
-       p = strchr (p + 1, resp->separator))
+  if (!resp->separator)
+    lev = 0;
+  else
+    {
+      char *p = resp->name + prefix_len;
+      if (p[0] == resp->separator)
+	for ( ; p; p = strchr (p + 1, resp->separator))
 	  lev++;
 	  lev++;
+    }
   resp->level = lev;
   resp->level = lev;
 }
 }
 
 
@@ -828,11 +833,15 @@ list_copy (mu_list_t dst, mu_list_t src,
   for (mu_iterator_first (itr); !mu_iterator_is_done (itr);
   for (mu_iterator_first (itr); !mu_iterator_is_done (itr);
        mu_iterator_next (itr))
        mu_iterator_next (itr))
     {
     {
+      char *name;
       struct mu_list_response *p;
       struct mu_list_response *p;
       mu_iterator_current (itr, (void **)&p);
       mu_iterator_current (itr, (void **)&p);
       guess_level (p, prefix_len);
       guess_level (p, prefix_len);
-      if ((max_level == 0 || p->level < max_level)
-	  && (!namecmp || namecmp (pattern, p->name) == 0))
+      name = p->name + prefix_len;
+      if (name[0] == p->separator && pattern[0] != p->separator)
+	name++;
+      if ((max_level == 0 || p->level <= max_level)
+	  && (!namecmp || namecmp (pattern, name) == 0))
 	mu_list_append (dst, p);
 	mu_list_append (dst, p);
       else
       else
 	free (p);
 	free (p);
@@ -2437,7 +2446,7 @@ imap_parse (f_imap_t f_imap)
 	    {
 	    {
 	      /* Cool we are doing ok.  */
 	      /* Cool we are doing ok.  */
 	    }
 	    }
-	  else /* NO and BAD */
+	  else if (strcasecmp (response, "NO") == 0)
 	    {
 	    {
 	      if (strncasecmp (remainder, "LOGIN", 5) == 0)
 	      if (strncasecmp (remainder, "LOGIN", 5) == 0)
 		{
 		{
@@ -2446,13 +2455,17 @@ imap_parse (f_imap_t f_imap)
 		  mu_observable_notify (observable, MU_EVT_AUTHORITY_FAILED);
 		  mu_observable_notify (observable, MU_EVT_AUTHORITY_FAILED);
 		  status = MU_ERR_AUTH_FAILURE;
 		  status = MU_ERR_AUTH_FAILURE;
 		}
 		}
+	      else if (strncasecmp (remainder, "LIST", 4) == 0)
+		status = MU_ERR_NOENT;
 	      else
 	      else
+		status = MU_ERR_FAILURE;
+	    }
+	  else /* NO and BAD */
 	    {
 	    {
 	      status = EINVAL;
 	      status = EINVAL;
 	      mu_error ("NO/Bad Tagged: %s %s\n", response, remainder);
 	      mu_error ("NO/Bad Tagged: %s %s\n", response, remainder);
 	    }
 	    }
 	}
 	}
-	}
       f_imap->ptr = f_imap->buffer;
       f_imap->ptr = f_imap->buffer;
     }
     }