X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frmf.c;h=a0c68a36e1b5738615d92a9af91a3d640acaac51;hb=1e42112bb983f886f389b1fa3ef4d90a4dad4f91;hp=374d752aef5e5181e01394b08f46e7f84665cdde;hpb=d3ba09a465cb0e5fc9a74d0b152a7ed965f895cb;p=mmh

diff --git a/uip/rmf.c b/uip/rmf.c
index 374d752..a0c68a3 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -12,9 +12,9 @@ static struct swit switches[] = {
 #define INTRSW  0
 	{ "interactive", 0 },
 #define NINTRSW  1
-	{ "nointeractive", 0 },
+	{ "nointeractive", 2 },
 #define VERSIONSW  2
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW  3
 	{ "help", 0 },
 	{ NULL, 0 }
@@ -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 */
@@ -127,7 +125,7 @@ main(int argc, char **argv)
 static int
 rmf(char *folder)
 {
-	int i, j, others;
+	int i, others;
 	register char *maildir;
 	char cur[BUFSIZ];
 	register struct dirent *dp;
@@ -161,7 +159,6 @@ rmf(char *folder)
 
 	ext_hook("del-hook", maildir, NULL);
 
-	j = strlen(backup_prefix);
 	while ((dp = readdir(dd))) {
 		switch (dp->d_name[0]) {
 		case '.':
@@ -170,22 +167,11 @@ rmf(char *folder)
 				continue;  /* else fall */
 
 		case ',':
-#ifdef MHE
-		case '+':
-#endif /* MHE */
-#ifdef UCI
-		case '_':
-		case '#':
-#endif /* UCI */
 			break;
 
 		default:
 			if (m_atoi(dp->d_name))
 				break;
-			if (strcmp(dp->d_name, altmsglink) == 0 ||
-					strncmp(dp->d_name,
-					backup_prefix, j) == 0)
-				break;
 
 			admonish(NULL, "file \"%s/%s\" not deleted",
 					folder, dp->d_name);