fix bug in "Support for aborting mailbox loading"

A typo would have prevented mbox_parse_mailbox() from working correctly.
Also, add a few comments.

Thanks to Pietro Cerutti (@gahr) for spotting this.

diff --git a/mbox.c b/mbox.c
index ee9fc0e14bb4961c154f8e447fab8cc633ad907f..edec339a949ac16bcdc8cfd48d40df7c4d1c0908 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -226,7 +226,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx)
   if (SigInt == 1)
   {
       SigInt = 0;
-      return -2;
+      return -2; /* action aborted */
   }
 
   return 0;
@@ -282,7 +282,7 @@ int mbox_parse_mailbox (CONTEXT *ctx)
   }
 
   loc = ftello (ctx->fp);
-  while ((fgets (buf, sizeof (buf), ctx->fp) != NULL) && (SigInt != 0))
+  while ((fgets (buf, sizeof (buf), ctx->fp) != NULL) && (SigInt != 1))
   {
     if (is_from (buf, return_path, sizeof (return_path), &t))
     {
@@ -420,7 +420,7 @@ int mbox_parse_mailbox (CONTEXT *ctx)
   if (SigInt == 1)
   {
     SigInt = 0;
-    return -2;
+    return -2; /* action aborted */
   }
 
   return 0;

diff --git a/mh.c b/mh.c
index 13f65484bf598e05dd40ddab073b6c4ac0a684c2..6ce17f92316c88e473961bbba2007a104ffc054f 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -888,7 +888,7 @@ static int maildir_parse_dir (CONTEXT * ctx, struct maildir ***last,
   if (SigInt == 1)
   {
     SigInt = 0;
-    return -2;
+    return -2; /* action aborted */
   }
 
   return 0;