[PATCH] Add verbose comments to split_msg()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



I was going to fix a bug in imap-send that was making it include the "From "
line from git-format-patch in the message sent to the IMAP server.  So I
commented up what split_msg already does.

It turns out the bug was fixed in commit
e0b0830726286287744cc9e1a629a534bbe75452.  So comments only, no fix needed.
(cherry picked from 3d5b1768f15b5cd430b869f416e72f4f3afe3d4a commit)

Signed-off-by: Andy Parkins <andyparkins@xxxxxxxxx>
---
 imap-send.c |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/imap-send.c b/imap-send.c
index a6a6568..110bd54 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -1216,35 +1216,48 @@ split_msg( msg_data_t *all_msgs, msg_data_t *msg, int *ofs )
 {
 	char *p, *data;
 
+	/* Clear this message's slot */
 	memset( msg, 0, sizeof *msg );
+	/* If we've run out of data, stop*/
 	if (*ofs >= all_msgs->len)
 		return 0;
 
+	/* Point at the next message chunk */
 	data = &all_msgs->data[ *ofs ];
+	/* This message length is at most, the length of all messages
+	 * minus our current position */
 	msg->len = all_msgs->len - *ofs;
 
+	/* If there isn't enough data remaining for a whole message or there
+	 * is no , give up */
 	if (msg->len < 5 || strncmp( data, "From ", 5 ))
 		return 0;
 
+	/* Find the end of the "From " line */
 	p = strchr( data, '\n' );
 	if (p) {
+		/* Skip this line from the outgoing buffer */
 		p = &p[1];
 		msg->len -= p-data;
 		*ofs += p-data;
 		data = p;
 	}
 
+	/* Find the next message (if any) */
 	p = strstr( data, "\nFrom " );
 	if (p)
 		msg->len = &p[1] - data;
 
+	/* Alloc enough space for this message */
 	msg->data = xmalloc( msg->len + 1 );
 	if (!msg->data)
 		return 0;
 
+	/* Copy the message from "all" to it's own holder and terminate */
 	memcpy( msg->data, data, msg->len );
 	msg->data[ msg->len ] = 0;
 
+	/* Move the data pointer to the next message */
 	*ofs += msg->len;
  	return 1;
 }
-- 
1.4.4.1.geeee8


-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]