Bugfix

* libproto/mbox/mboxscan.c (mbox_scan_internal): Fix
body size calculation: -1 was returned for empty body.
Bug reported by Con Tassios <ct@swin.edu.au>.
* po/POTFILES.in: Add mail/mailvar.c

@@ -385,15 +385,15 @@ mbox_scan_internal (mu_mailbox_t mailbox, mbox_message_t mum,
 	    }
 	    }
 	}
 	}
 
 
-      newline = nl;
-
+      newline = (inbody && lines) ? nl : 0;
+      
       /* Every 100 mesgs update the lock, it should be every minute.  */
       /* Every 100 mesgs update the lock, it should be every minute.  */
       if ((mud->messages_count % 100) == 0)
       if ((mud->messages_count % 100) == 0)
 	mu_locker_touchlock (mailbox->locker);
 	mu_locker_touchlock (mailbox->locker);
 
 
       /* Ping them every 1000 lines. Should be tunable.  */
       /* Ping them every 1000 lines. Should be tunable.  */
       if (flags & MBOX_SCAN_NOTIFY)
       if (flags & MBOX_SCAN_NOTIFY)
-	if (((lines +1) % 1000) == 0)
+	if (((lines + 1) % 1000) == 0)
 	  DISPATCH_PROGRESS (mailbox, mud);
 	  DISPATCH_PROGRESS (mailbox, mud);
 
 
     } /* while */
     } /* while */

@@ -112,6 +112,7 @@ mail/if.c
 mail/inc.c
 mail/inc.c
 mail/mail.c
 mail/mail.c
 mail/mailline.c
 mail/mailline.c
+mail/mailvar.c
 mail/msgset.y
 mail/msgset.y
 mail/next.c
 mail/next.c
 mail/previous.c
 mail/previous.c