X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fburst.c;h=6316e136ab638d5bd12e46fcb37193441a0f37bf;hb=8e79ce1919d9cf54f101a812e0fd70a33286b9f3;hp=908de0df8110bbdc53c2426af031e4af7d161aa8;hpb=a259594cc41e41bfbb90562d3977b8194d1446f5;p=mmh

diff --git a/uip/burst.c b/uip/burst.c
index 908de0d..6316e13 100644
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -2,8 +2,6 @@
 /*
  * burst.c -- explode digests into individual messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -31,11 +29,9 @@ static struct swit switches[] = {
     { NULL, 0 }
 };
 
-static char delim3[] = "-------";
-
 struct smsg {
-    long s_start;
-    long s_stop;
+    off_t s_start;
+    off_t s_stop;
 };
 
 /*
@@ -45,6 +41,16 @@ static int find_delim (int, struct smsg *);
 static void burst (struct msgs **, int, struct smsg *, int, int, int, char *);
 static void cpybrst (FILE *, FILE *, char *, char *, int);
 
+/*
+ * A macro to check to see if we have reached a message delimiter
+ * (an encapsulation boundary, EB, in RFC 934 parlance).
+ *
+ * According to RFC 934, an EB is simply a line which starts with
+ * a "-" and is NOT followed by a space.  So even a single "-" on a line
+ * by itself would be an EB.
+ */
+
+#define CHECKDELIM(buffer) (buffer[0] == '-' && buffer[1] != ' ')
 
 int
 main (int argc, char **argv)
@@ -80,10 +86,10 @@ main (int argc, char **argv)
 		snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		print_help (buf, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case INPLSW: 
 		inplace++;
@@ -111,7 +117,7 @@ main (int argc, char **argv)
 	    if (folder)
 		adios (NULL, "only one folder at a time!");
 	    else
-		folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+		folder = pluspath (cp);
 	} else {
 	    msgs[msgp++] = cp;
 	}
@@ -189,7 +195,8 @@ main (int argc, char **argv)
     seq_save (mp);	/* synchronize message sequences */
     context_save ();	/* save the context file         */
     folder_free (mp);	/* free folder/message structure */
-    return done (0);
+    done (0);
+    return 1;
 }
 
 
@@ -201,38 +208,56 @@ main (int argc, char **argv)
 static int
 find_delim (int msgnum, struct smsg *smsgs)
 {
-    int ld3, wasdlm, msgp;
-    long pos;
+    int wasdlm = 0, msgp;
+    off_t pos;
     char c, *msgnam;
-    int cc;
     char buffer[BUFSIZ];
     FILE *in;
 
-    ld3 = strlen (delim3);
-
     if ((in = fopen (msgnam = m_name (msgnum), "r")) == NULL)
 	adios (msgnam, "unable to read message");
 
     for (msgp = 0, pos = 0L; msgp <= MAXFOLDER;) {
+    	/*
+	 * We're either at the beginning of the whole message, or
+	 * we're just past the delimiter of the last message.
+	 * Swallow lines until we get to something that's not a newline
+	 */
 	while (fgets (buffer, sizeof(buffer), in) && buffer[0] == '\n')
 	    pos += (long) strlen (buffer);
 	if (feof (in))
 	    break;
-	fseek (in, pos, SEEK_SET);
+
+	/*
+	 * Reset to the beginning of the last non-blank line, and save our
+	 * starting position.  This is where the encapsulated message
+	 * starts.
+	 */
+	fseeko (in, pos, SEEK_SET);
 	smsgs[msgp].s_start = pos;
 
+	/*
+	 * Read in lines until we get to a message delimiter.
+	 *
+	 * Previously we checked to make sure the preceeding line and
+	 * next line was a newline.  That actually does not comply with
+	 * RFC 934, so make sure we break on a message delimiter even
+	 * if the previous character was NOT a newline.
+	 */
 	for (c = 0; fgets (buffer, sizeof(buffer), in); c = buffer[0]) {
-	    if (strncmp (buffer, delim3, ld3) == 0
-		    && (msgp == 1 || c == '\n')
-		    && ((cc = peekc (in)) == '\n' || cc == EOF))
+	    if ((wasdlm = CHECKDELIM(buffer)))
 		break;
 	    else
 		pos += (long) strlen (buffer);
 	}
 
-	wasdlm = strncmp (buffer, delim3, ld3) == 0;
-	if (smsgs[msgp].s_start != pos)
+	/*
+	 * Only count as a new message if we got the message delimiter.
+	 * Swallow a blank line if it was right before the message delimiter.
+	 */
+	if (smsgs[msgp].s_start != pos && wasdlm)
 	    smsgs[msgp++].s_stop = (c == '\n' && wasdlm) ? pos - 1 : pos;
+
 	if (feof (in)) {
 #if 0
 	    if (wasdlm) {
@@ -246,7 +271,7 @@ find_delim (int msgnum, struct smsg *smsgs)
     }
 
     fclose (in);
-    return (msgp - 1);		/* toss "End of XXX Digest" */
+    return (msgp - 1);		/* return the number of messages burst */
 }
 
 
@@ -268,7 +293,8 @@ burst (struct msgs **mpp, int msgnum, struct smsg *smsgs, int numburst,
     if ((in = fopen (msgnam = m_name (msgnum), "r")) == NULL)
 	adios (msgnam, "unable to read message");
 
-    mode = fstat (fileno(in), &st) != NOTOK ? (st.st_mode & 0777) : m_gmprot();
+    mode =
+      fstat (fileno(in), &st) != NOTOK ? (int) (st.st_mode & 0777) : m_gmprot();
     mp = *mpp;
 
     /*
@@ -346,14 +372,13 @@ burst (struct msgs **mpp, int msgnum, struct smsg *smsgs, int numburst,
     i = inplace ? msgnum + numburst : mp->hghmsg;
     for (j = numburst; j >= (inplace ? 0 : 1); i--, j--) {
 	strncpy (f1, m_name (i), sizeof(f1));
-	strncpy (f2, m_scratch ("", invo_name), sizeof(f2));
+	strncpy (f2, m_mktemp(invo_name, NULL, &out), sizeof(f2));
+
 	if (verbosw && i != msgnum)
 	    printf ("message %d of digest %d becomes message %d\n", j, msgnum, i);
 
-	if ((out = fopen (f2, "w")) == NULL)
-	    adios (f2, "unable to write message");
 	chmod (f2, mode);
-	fseek (in, smsgs[j].s_start, SEEK_SET);
+	fseeko (in, smsgs[j].s_start, SEEK_SET);
 	cpybrst (in, out, msgnam, f2,
 		(int) (smsgs[j].s_stop - smsgs[j].s_start));
 	fclose (out);