Removed some dead code, all inside #if 0's. I tried to not remove

[mmh] / uip / burst.c

diff --git a/uip/burst.c b/uip/burst.c
index 2c741c7..93fd5e0 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -8,6 +8,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 static struct swit switches[] = {
 #define        INPLSW  0
@@ -30,8 +31,8 @@ static struct swit switches[] = {
 };
 
 struct smsg {
-    long s_start;
-    long s_stop;
+    off_t s_start;
+    off_t s_stop;
 };
 
 /*
@@ -56,9 +57,10 @@ int
 main (int argc, char **argv)
 {
     int inplace = 0, quietsw = 0, verbosw = 0;
-    int msgp = 0, hi, msgnum, numburst;
+    int hi, msgnum, numburst;
     char *cp, *maildir, *folder = NULL, buf[BUFSIZ];
-    char **argp, **arguments, *msgs[MAXARGS];
+    char **argp, **arguments;
+    struct msgs_array msgs = { 0, 0, NULL };
     struct smsg *smsgs;
     struct msgs *mp;
 
@@ -86,10 +88,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++;
@@ -119,14 +121,14 @@ main (int argc, char **argv)
            else
                folder = pluspath (cp);
        } else {
-           msgs[msgp++] = cp;
+           app_msgarg(&msgs, cp);
        }
     }
 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
-    if (!msgp)
-       msgs[msgp++] = "cur";
+    if (!msgs.size)
+       app_msgarg(&msgs, "cur");
     if (!folder)
        folder = getfolder (1);
     maildir = m_maildir (folder);
@@ -143,8 +145,8 @@ main (int argc, char **argv)
        adios (NULL, "no messages in %s", folder);
 
     /* parse all the message ranges/sequences and set SELECTED */
-    for (msgnum = 0; msgnum < msgp; msgnum++)
-       if (!m_convert (mp, msgs[msgnum]))
+    for (msgnum = 0; msgnum < msgs.size; msgnum++)
+       if (!m_convert (mp, msgs.msgs[msgnum]))
            done (1);
     seq_setprev (mp);  /* set the previous-sequence */
 
@@ -208,10 +210,9 @@ main (int argc, char **argv)
 static int
 find_delim (int msgnum, struct smsg *smsgs)
 {
-    int wasdlm, msgp;
-    long pos;
+    int wasdlm = 0, msgp;
+    off_t pos;
     char c, *msgnam;
-    int cc;
     char buffer[BUFSIZ];
     FILE *in;
 
@@ -219,25 +220,46 @@ find_delim (int msgnum, struct smsg *smsgs)
        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 (CHECKDELIM(buffer)
-                   && (msgp == 1 || c == '\n')
-                   && ((cc = peekc (in)) == '\n' || cc == EOF))
+           if ((wasdlm = CHECKDELIM(buffer)))
                break;
            else
                pos += (long) strlen (buffer);
        }
 
-       wasdlm = CHECKDELIM(buffer);
-       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) {
@@ -251,7 +273,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 */
 }
 
 
@@ -358,7 +380,7 @@ burst (struct msgs **mpp, int msgnum, struct smsg *smsgs, int numburst,
            printf ("message %d of digest %d becomes message %d\n", j, msgnum, i);
 
        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);