X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fburst.c;h=fdc78f43ffa69ac629c11791ae51edfc0674a079;hb=8589851acf19172bce7d6ecb44e3a4215beff3e5;hp=44f6bfe94e4b7b7e54ef17a0d4f5b2b32264e9a5;hpb=3d78b9c80a95f4e7885ed607018f9b1b9be559b4;p=mmh

diff --git a/uip/burst.c b/uip/burst.c
index 44f6bfe..fdc78f4 100644
--- 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
@@ -216,11 +216,13 @@ find_delim(int msgnum, struct smsg *smsgs)
 
 		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))
-				break;
-			else
+					&& (msgp == 1 || c == '\n')) {
+				cc = getc(in);
+				ungetc(cc, in);
+				if (cc == '\n' || cc == EOF) {
+					break;
+				}
+			} else
 				pos += (long) strlen(buffer);
 		}
 
@@ -229,13 +231,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 +358,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 +393,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;
 
-			case S2:
-				switch (c) {
-					case '\n':
-						state = S1;
-					default:
-						fputc(c, out);
-						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 S3:
-				switch (c) {
-					case ' ':
-						state = S2;
-						break;
-
-					default:
-						state = (c == '\n') ? S1 : S2;
-						fputc('-', out);
-						fputc(c, out);
-						break;
-				}
+		case S3:
+			switch (c) {
+			case ' ':
+				state = S2;
 				break;
+
+			default:
+				state = (c == '\n') ? S1 : S2;
+				fputc('-', out);
+				fputc(c, out);
+				break;
+			}
+			break;
 		}
 	}