[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-sync-rewrite.c, 1.18, 1.19

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-storage/index/mbox
In directory talvi:/tmp/cvs-serv10426/lib-storage/index/mbox

Modified Files:
	mbox-sync-rewrite.c 
Log Message:
fix



Index: mbox-sync-rewrite.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync-rewrite.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- mbox-sync-rewrite.c	19 Jun 2004 00:19:48 -0000	1.18
+++ mbox-sync-rewrite.c	19 Jun 2004 19:52:25 -0000	1.19
@@ -157,10 +157,12 @@
 	   the beginning of header instead of end, we don't have to
 	   worry about multiline-headers. */
 	str_delete(ctx->header, start_pos, *size);
-	last_line_pos = last_line_pos <= *size ?
-		start_pos : last_line_pos - *size;
-
+	if (last_line_pos <= start_pos + *size)
+		last_line_pos = start_pos;
+	else
+		last_line_pos -= *size;
 	data_size -= *size;
+
 	*size = 0;
 
 	if (ctx->mail.space < data_size - last_line_pos) {
@@ -216,8 +218,6 @@
 		if (new_hdr_size <= old_hdr_size) {
 			/* good, we removed enough. */
 			i_assert(new_hdr_size == old_hdr_size);
-			ctx->mail.space =
-				-(ssize_t)(new_hdr_size - old_hdr_size);
 		} else if (move_diff < 0 &&
 			   new_hdr_size - old_hdr_size <= -move_diff) {
 			/* moving backwards - we can use the extra space from