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

diff --git a/uip/rmm.c b/uip/rmm.c
index 35983bd..ecc9b9b 100644
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -25,19 +25,20 @@ static struct swit switches[] = {
 int
 main(int argc, char **argv)
 {
-	int msgnum, unlink_msgs = 0;
-	char *cp, *maildir, *folder = NULL;
+	int msgnum, unlink_msgs = 0, vecp = 0;
+	char *cp, *maildir, *folder = NULL, **vec;
 	char buf[BUFSIZ], **argp;
 	char **arguments;
 	struct msgs_array msgs = { 0, 0, NULL };
 	struct msgs *mp;
+	pid_t pid;
+
 
 #ifdef LOCALE
 	setlocale(LC_ALL, "");
 #endif
 	invo_name = mhbasename(argv[0]);
 
-	/* read user profile/context */
 	context_read();
 
 	arguments = getarguments(invo_name, argc, argv, 1);
@@ -101,26 +102,72 @@ main(int argc, char **argv)
 			done(1);
 	seq_setprev(mp);  /* set the previous-sequence */
 
+
+	if (unlink_msgs) {
+		/* "remove" the SELECTED messages */
+		folder_delmsgs(mp, 1);
+
+		seq_save(mp);
+		context_replace(curfolder, folder);
+		context_save();
+		folder_free(mp);
+		done(0);
+		return 1;
+	}
+
 	/*
-	** This is hackish.  If we are using a external rmmproc,
+	** This is hackish.  If we don't unlink, but refile,
 	** then we need to update the current folder in the
-	** context so the external rmmproc will remove files
-	** from the correct directory.  This should be moved to
-	** folder_delmsgs().
+	** context so the external program will refile files
+	** from the correct directory.
 	*/
-	if (rmmproc) {
-		context_replace(curfolder, folder);
-		context_save();
-		fflush(stdout);
+	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;
+
+	if (mp->numsel+4 > MAXARGS)
+		adios(NULL, "more than %d messages for refile exec",
+				MAXARGS - 4);
+	vec = (char **)mh_xmalloc((size_t)(mp->numsel + 4) * sizeof(*vec));
+	vec[vecp++] = "refile";
+	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");
+		}
 	}
+	vec[vecp] = NULL;
+
+	fflush(stdout);
+	switch (pid = fork()) {
+	case -1:
+		adios("fork", "unable to");
 
-	/* "remove" the SELECTED messages */
-	folder_delmsgs(mp, unlink_msgs, 0);
+	case 0:
+		execvp(*vec, vec);
+		fprintf(stderr, "unable to exec ");
+		perror(*vec);
+		_exit(-1);
+
+	default:
+		pidwait(pid, -1);
+	}
 
-	seq_save(mp);  /* synchronize message sequences  */
-	context_replace(curfolder, folder);  /* update current folder   */
-	context_save();  /* save the context file   */
-	folder_free(mp);  /* free folder structure   */
+	folder_free(mp);
 	done(0);
 	return 1;
 }