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

diff --git a/uip/burst.c b/uip/burst.c
index 44f6bfe..0e7c53a 100644
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -107,7 +107,7 @@ 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;
 		}
@@ -116,8 +116,8 @@ main(int argc, char **argv)
 	if (!msgp)
 		msgs[msgp++] = "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
@@ -363,14 +363,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;