X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frmf.c;h=b9c1969b9adb9b9693d6e1f50e7e0705c62a8b05;hp=923f23aed377c6887da6f151efe83719e86d45ba;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=3cc8ed080f6e741b8df04a3ebe764c659e75cb38

diff --git a/uip/rmf.c b/uip/rmf.c
index 923f23a..b9c1969 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -14,7 +14,7 @@ static struct swit switches[] = {
 #define NINTRSW  1
 	{ "nointeractive", 0 },
 #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,13 +170,6 @@ rmf(char *folder)
 				continue;  /* else fall */
 
 		case ',':
-#ifdef MHE
-		case '+':
-#endif /* MHE */
-#ifdef UCI
-		case '_':
-		case '#':
-#endif /* UCI */
 			break;
 
 		default:
@@ -241,7 +234,7 @@ rma(char *folder)
 	** "atr-something-folderpath", and remove them.
 	*/
 	for (np = m_defs, pp = NULL; np; np = np->n_next) {
-		if (isprefix("atr-", np->n_name) &&
+		if (strncmp(np->n_name, "atr-", alen)==0 &&
 				(j = strlen(np->n_name) - plen) > alen &&
 				*(np->n_name + j) == '-' &&
 				strcmp(cp, np->n_name + j + 1) == 0) {