X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frmf.c;h=164ec77b48f979124a14ec00fd96621af6f061be;hp=096a9bf279b73bd0711aac9f909cb8b6dded00c1;hb=fede6e42d81ce34fd5c1bbe7fb2757b281c2573a;hpb=30292c537fe4eab052f303f1d3179c0e2fd037d8

diff --git a/uip/rmf.c b/uip/rmf.c
index 096a9bf..164ec77 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -12,7 +12,7 @@ static struct swit switches[] = {
 #define INTRSW  0
 	{ "interactive", 0 },
 #define NINTRSW  1
-	{ "nointeractive", 0 },
+	{ "nointeractive", 2 },
 #define VERSIONSW  2
 	{ "Version", 0 },
 #define HELPSW  3
@@ -34,9 +34,7 @@ main(int argc, char **argv)
 	char *cp, *folder = NULL, newfolder[BUFSIZ];
 	char buf[BUFSIZ], **argp, **arguments;
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -50,17 +48,17 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				done(1);
+				exit(1);
 			case UNKWNSW:
 				adios(NULL, "-%s unknown", cp);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf), "%s [+folder] [switches]", invo_name);
 				print_help(buf, switches, 1);
-				done(1);
+				exit(0);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(0);
 
 			case INTRSW:
 				interactive = 1;
@@ -107,7 +105,7 @@ main(int argc, char **argv)
 	if (interactive) {
 		cp = concat("Remove folder \"", folder, "\"? ", NULL);
 		if (!getanswer(cp))
-			done(0);
+			exit(0);
 		free(cp);
 	}
 
@@ -120,14 +118,13 @@ main(int argc, char **argv)
 		}
 	}
 	context_save();  /* save the context file */
-	done(0);
-	return 1;
+	return 0;
 }
 
 static int
 rmf(char *folder)
 {
-	int i, j, others;
+	int i, others;
 	register char *maildir;
 	char cur[BUFSIZ];
 	register struct dirent *dp;
@@ -161,7 +158,6 @@ rmf(char *folder)
 
 	ext_hook("del-hook", maildir, NULL);
 
-	j = strlen(backup_prefix);
 	while ((dp = readdir(dd))) {
 		switch (dp->d_name[0]) {
 		case '.':
@@ -175,8 +171,6 @@ rmf(char *folder)
 		default:
 			if (m_atoi(dp->d_name))
 				break;
-			if (strncmp(dp->d_name, backup_prefix, j) == 0)
-				break;
 
 			admonish(NULL, "file \"%s/%s\" not deleted",
 					folder, dp->d_name);