X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frmf.c;h=9d207522ecc9d55061b83054f60eb488bcd05e05;hb=5f2b39344cca1086c975d47b730929d8f1904214;hp=48a555e9bd89da605f93e7f51217196e86677214;hpb=b0b1dd37ff515578cf7cba51625189eb34a196cb;p=mmh

diff --git a/uip/rmf.c b/uip/rmf.c
index 48a555e..9d20752 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 }
@@ -113,7 +113,7 @@ main(int argc, char **argv)
 
 	if (rmf(folder) == OK) {
 		char *cfolder = context_find(curfolder);
-		if (cfolder && strcmp(cfolder, newfolder)) {
+		if (cfolder && strcmp(cfolder, newfolder)!=0) {
 			printf("[+%s now current]\n", newfolder);
 			/* update current folder */
 			context_replace(curfolder, newfolder);
@@ -170,21 +170,12 @@ 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)
+			if (strncmp(dp->d_name, backup_prefix, j) == 0)
 				break;
 
 			admonish(NULL, "file \"%s/%s\" not deleted",