Replaced mkinstalldirs with `mkdir -p'.

[mmh] / uip / burst.c

diff --git a/uip/burst.c b/uip/burst.c
index 44f6bfe..725abec 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -107,17 +107,17 @@ main(int argc, char **argv)
                        if (folder)
                                adios(NULL, "only one folder at a time!");
                        else
-                               folder = pluspath(cp);
+                               folder = getcpy(expandfol(cp));
                } else {
                        msgs[msgp++] = cp;
                }
        }
 
        if (!msgp)
-               msgs[msgp++] = "cur";
+               msgs[msgp++] = seq_cur;
        if (!folder)
-               folder = getfolder(FCUR);
-       maildir = m_maildir(folder);
+               folder = getcurfol();
+       maildir = toabsdir(folder);
 
        if (chdir(maildir) == NOTOK)
                adios(maildir, "unable to change directory to");
@@ -162,7 +162,7 @@ main(int argc, char **argv)
        }
 
        free((char *) smsgs);
-       context_replace(pfolder, folder);  /* update current folder */
+       context_replace(curfolder, folder);  /* update current folder */
 
        /*
        ** If -inplace is given, then the first message burst becomes
@@ -229,13 +229,6 @@ find_delim(int msgnum, struct smsg *smsgs)
                        smsgs[msgp++].s_stop = (c == '\n' && wasdlm) ?
                                        pos - 1 : pos;
                if (feof(in)) {
-#if 0
-                       if (wasdlm) {
-                               smsgs[msgp - 1].s_stop -=
-                                               ((long) strlen(buffer) + 1);
-                               msgp++;  /* fake "End of XXX Digest" */
-                       }
-#endif
                        break;
                }
                pos += (long) strlen(buffer);
@@ -363,14 +356,14 @@ burst(struct msgs **mpp, int msgnum, struct smsg *smsgs, int numburst,
                        if (rename(f1, f3) == NOTOK)
                                admonish(f3, "unable to rename %s to", f1);
 
-                       (void)snprintf(f3, sizeof (f3), "%s/%d", maildir, i);
-                       ext_hook("del-hook", f3, (char *)0);
+                       snprintf(f3, sizeof (f3), "%s/%d", maildir, i);
+                       ext_hook("del-hook", f3, NULL);
                }
                if (rename(f2, f1) == NOTOK)
                        admonish(f1, "unable to rename %s to", f2);
 
-               (void)snprintf(f3, sizeof (f3), "%s/%d", maildir, i);
-               ext_hook("add-hook", f3, (char *)0);
+               snprintf(f3, sizeof (f3), "%s/%d", maildir, i);
+               ext_hook("add-hook", f3, NULL);
 
                copy_msg_flags(mp, i, msgnum);
                mp->msgflags |= SEQMOD;
@@ -398,43 +391,43 @@ cpybrst(FILE *in, FILE *out, char *ifile, char *ofile, int len)
                if (c == 0)
                        continue;
                switch (state) {
-                       case S1:
-                               switch (c) {
-                                       case '-':
-                                               state = S3;
-                                               break;
-
-                                       default:
-                                               state = S2;
-                                       case '\n':
-                                               fputc(c, out);
-                                               break;
-                               }
+               case S1:
+                       switch (c) {
+                       case '-':
+                               state = S3;
+                               break;
+
+                       default:
+                               state = S2;
+                       case '\n':
+                               fputc(c, out);
+                               break;
+                       }
+                       break;
+
+               case S2:
+                       switch (c) {
+                       case '\n':
+                               state = S1;
+                       default:
+                               fputc(c, out);
                                break;
+                       }
+                       break;
 
-                       case S2:
-                               switch (c) {
-                                       case '\n':
-                                               state = S1;
-                                       default:
-                                               fputc(c, out);
-                                               break;
-                               }
+               case S3:
+                       switch (c) {
+                       case ' ':
+                               state = S2;
                                break;
 
-                       case S3:
-                               switch (c) {
-                                       case ' ':
-                                               state = S2;
-                                               break;
-
-                                       default:
-                                               state = (c == '\n') ? S1 : S2;
-                                               fputc('-', out);
-                                               fputc(c, out);
-                                               break;
-                               }
+                       default:
+                               state = (c == '\n') ? S1 : S2;
+                               fputc('-', out);
+                               fputc(c, out);
                                break;
+                       }
+                       break;
                }
        }