Clean buffy.c and init.c

- Use useful variable in init
- We don't need to use Context since s is already the path we want

Signed-off-by: Julien Danjou <julien@danjou.info>
Signed-off-by: Pierre Habouzit <madcoder@madism.org>

diff --git a/buffy.c b/buffy.c
index 4018c5f..2b77b2d 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -157,14 +157,18 @@ static inline void buffy_free (BUFFY** p) {
   p_delete(p);
 }
 
+/* Return the index number of path in Incoming list */
 int buffy_lookup (const char* path) {
   int i = 0;
+
   if (list_empty(Incoming) || !path || !*path)
     return (-1);
+
   for (i = 0; i < Incoming->length; i++) {
-    if (!m_strcmp(((BUFFY*)Incoming->data[i])->path, path) )
+    if (!m_strcmp(((BUFFY *)Incoming->data[i])->path, path))
       return (i);
   }
+
   return (-1);
 }
 
@@ -549,15 +553,16 @@ void buffy_next (char *s, size_t slen)
     }
 
   /*
-   * If buffy_lookup returns the index,
+   * buffy_lookup returns the index,
    * or -1 if not found (-1..Incoming->length-1);
    * plus one --> (0..Incoming->length).
    * Modulo mapps it into the correct range.
    */
   i = 1 + buffy_lookup (s);
-  for (l=0; l < Incoming->length; l++) {
+  for (l = 0; l < Incoming->length; l++) {
     c = (l+i) % Incoming->length;
-    if ((!Context || !Context->path || m_strcmp(((BUFFY*) Incoming->data[c])->path, Context->path)) &&
+
+    if (m_strcmp(((BUFFY*) Incoming->data[c])->path, s) &&
         ((BUFFY*) Incoming->data[c])->new > 0)
       break;
   }
@@ -565,7 +570,7 @@ void buffy_next (char *s, size_t slen)
     *s = '\0';
     /* something went wrong since we're here when buffy_check
      * reported new mail */
-    buffy_check (0);
+    buffy_check (1);
   } else {
     m_strcpy(s, slen, ((BUFFY*)Incoming->data[c])->path);
     mutt_pretty_mailbox (s);

diff --git a/init.c b/init.c
index ad55667..193116d 100644 (file)
--- a/init.c
+++ b/init.c
@@ -258,7 +258,7 @@ static void sys_to_string (char* dst, ssize_t dstlen,
                                       Maildirlength) == 0 &&
        m_strlen(CurrentFolder) > Maildirlength) {
      val = CurrentFolder + Maildirlength;
-     if (Maildir[strlen(Maildir)-1]!='/')
+     if (Maildir[Maildirlength]!='/')
        val += 1;
      /* if not $folder, just use everything after last / */
     } else if ((t = strrchr (CurrentFolder, '/')) != NULL)