On Fri, Aug 01, 2008 at 10:13:54AM +0200, Tino Keitel wrote:
> mbsync stumbled over a file in this maildir that was zero sized.
> Mbsync should better report that error, though.
> 
does this patch help?

-- 
Hi! I'm a .signature virus! Copy me into your ~/.signature, please!
--
Confusion, chaos, panic - my work here is done.
? isync-1.0.x-warn-badmsg.diff
Index: drv_imap.c
===================================================================
RCS file: /cvsroot/isync/isync/src/drv_imap.c,v
retrieving revision 1.10.2.9
diff -U2 -r1.10.2.9 drv_imap.c
--- drv_imap.c	23 Aug 2008 07:55:15 -0000	1.10.2.9
+++ drv_imap.c	23 Aug 2008 08:39:15 -0000
@@ -1587,4 +1587,5 @@
 		/* invalid message */
 		free( fmap );
+		fprintf( stderr, "IMAP warning: storing message with incomplete header.\n" );
 		return DRV_MSG_BAD;
 	 mktid:
Index: sync.c
===================================================================
RCS file: /cvsroot/isync/isync/src/sync.c,v
retrieving revision 1.43.2.4
diff -U2 -r1.43.2.4 sync.c
--- sync.c	23 Aug 2008 07:55:15 -0000	1.43.2.4
+++ sync.c	23 Aug 2008 08:39:15 -0000
@@ -302,4 +302,11 @@
 						smsg->flags = msgdata.flags;
 						switch (tdriver->store_msg( tctx, &msgdata, &uid )) {
+						case DRV_MSG_BAD:
+							warn( pull ?
+							      "Warning: Slave refuses to store message %d from master.\n" :
+							      "Warning: Master refuses to store message %d from slave.\n",
+							      smsg->uid );
+							smsg->status |= M_NOT_SYNCED;
+							break;
 						case DRV_STORE_BAD: return pull ? SYNC_SLAVE_BAD : SYNC_MASTER_BAD;
 						default: return SYNC_FAIL;
@@ -400,4 +407,11 @@
 						msg->flags = msgdata.flags;
 						switch (tdriver->store_msg( tctx, &msgdata, &uid )) {
+						case DRV_MSG_BAD:
+							warn( pull ?
+							      "Warning: Slave refuses to store message %d from master.\n" :
+							      "Warning: Master refuses to store message %d from slave.\n",
+							      msg->uid );
+							msg->status |= M_NOT_SYNCED;
+							continue;
 						case DRV_STORE_BAD: return pull ? SYNC_SLAVE_BAD : SYNC_MASTER_BAD;
 						default: return SYNC_FAIL;
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
isync-devel mailing list
isync-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/isync-devel

Reply via email to