X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frmm.c;h=f6026411a6de5b1726e7e76adade4c4cd80465be;hb=04e93dabf152cc30d0aeb043d65f911ef765a176;hp=ecc9b9b425dacd929b7c8d22f4dc9d4722025dcb;hpb=8edc5aaf86f9f77124664f6801bc6c6cdf258173;p=mmh

diff --git a/uip/rmm.c b/uip/rmm.c
index ecc9b9b..f602641 100644
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -13,9 +13,9 @@ static struct swit switches[] = {
 #define UNLINKSW  0
 	{ "unlink", 0 },
 #define NUNLINKSW  1
-	{ "nounlink", 0 },
+	{ "nounlink", 2 },
 #define VERSIONSW  2
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW  3
 	{ "help", 0 },
 	{ NULL, 0 }
@@ -33,10 +33,7 @@ main(int argc, char **argv)
 	struct msgs *mp;
 	pid_t pid;
 
-
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	context_read();
@@ -71,84 +68,76 @@ main(int argc, char **argv)
 			}
 		}
 		if (*cp == '+' || *cp == '@') {
-			if (folder)
+			if (folder) {
 				adios(NULL, "only one folder at a time!");
-			else
+			} else {
 				folder = getcpy(expandfol(cp));
-		} else
+			}
+		} else {
 			app_msgarg(&msgs, cp);
+		}
 	}
 
-	if (!msgs.size)
+	if (!msgs.size) {
 		app_msgarg(&msgs, seq_cur);
-	if (!folder)
+	}
+	if (!folder) {
 		folder = getcurfol();
+	}
 	maildir = toabsdir(folder);
 
-	if (chdir(maildir) == NOTOK)
+	if (chdir(maildir) == NOTOK) {
 		adios(maildir, "unable to change directory to");
+	}
 
 	/* read folder and create message structure */
-	if (!(mp = folder_read(folder)))
+	if (!(mp = folder_read(folder))) {
 		adios(NULL, "unable to read folder %s", folder);
-
-	/* check for empty folder */
-	if (mp->nummsg == 0)
+	}
+	if (mp->nummsg == 0) {
 		adios(NULL, "no messages in %s", folder);
-
-	/* parse all the message ranges/sequences and set SELECTED */
-	for (msgnum = 0; msgnum < msgs.size; msgnum++)
-		if (!m_convert(mp, msgs.msgs[msgnum]))
+	}
+	/*
+	** parse all the message ranges/sequences and set SELECTED
+	** (We do this for the refiling case as well, to complain
+	** about invalid msg arguments in rmm, before we call refile.)
+	*/
+	for (msgnum = 0; msgnum < msgs.size; msgnum++) {
+		if (!m_convert(mp, msgs.msgs[msgnum])) {
 			done(1);
-	seq_setprev(mp);  /* set the previous-sequence */
+		}
+	}
 
+	context_replace(curfolder, folder);
+	context_save();
 
 	if (unlink_msgs) {
 		/* "remove" the SELECTED messages */
 		folder_delmsgs(mp, 1);
-
+		seq_setprev(mp);
 		seq_save(mp);
-		context_replace(curfolder, folder);
-		context_save();
 		folder_free(mp);
 		done(0);
 		return 1;
 	}
 
-	/*
-	** This is hackish.  If we don't unlink, but refile,
-	** then we need to update the current folder in the
-	** context so the external program will refile files
-	** from the correct directory.
-	*/
-	context_replace(curfolder, folder);
-	context_save();
-	fflush(stdout);
-
 	/* remove by refiling. */
-	/* Unset the EXISTS flag for each message to be removed */
-	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
-		if (is_selected(mp, msgnum))
-			unset_exists(mp, msgnum);
-	}
 
-	/* Mark that the sequence information has changed */
-	mp->msgflags |= SEQMOD;
+	folder_free(mp);
+	fflush(stdout);
 
-	if (mp->numsel+4 > MAXARGS)
+	if (msgs.size+6 > MAXARGS) {
 		adios(NULL, "more than %d messages for refile exec",
-				MAXARGS - 4);
-	vec = (char **)mh_xmalloc((size_t)(mp->numsel + 4) * sizeof(*vec));
+				MAXARGS - 6);
+	}
+	vec = (char **)mh_xmalloc((size_t)(msgs.size + 6) * sizeof(*vec));
 	vec[vecp++] = "refile";
+	vec[vecp++] = "-src";
+	vec[vecp++] = concat("+", folder, NULL);
 	vec[vecp++] = "-nolink";
 	vec[vecp++] = concat("+", trashfolder, NULL);
-	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
-		if (!is_selected(mp, msgnum)) {
-			continue;
-		}
-		if (!(vec[vecp++] = strdup(m_name(msgnum)))) {
-			adios(NULL, "strdup failed");
-		}
+	for (msgnum = 0; msgnum < msgs.size; msgnum++) {
+		vec[vecp++] = msgs.msgs[msgnum];
 	}
 	vec[vecp] = NULL;
 
@@ -167,7 +156,6 @@ main(int argc, char **argv)
 		pidwait(pid, -1);
 	}
 
-	folder_free(mp);
 	done(0);
 	return 1;
 }