X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frmf.c;h=9d207522ecc9d55061b83054f60eb488bcd05e05;hb=853cad7faa5eed9a5988825ac24f462887e12494;hp=f214f59a8e12baa3ed46e178e267dede1a742587;hpb=5b792c4424571f05bc2008e3109797d18d7d00d1;p=mmh

diff --git a/uip/rmf.c b/uip/rmf.c
index f214f59..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);
@@ -139,8 +139,8 @@ rmf(char *folder)
 			break;  /* fall otherwise */
 
 	case NOTOK:
-		snprintf(cur, sizeof(cur), "atr-%s-%s",
-					current, toabsdir(folder));
+		snprintf(cur, sizeof(cur), "atr-%s-%s", seq_cur,
+				toabsdir(folder));
 		if (!context_del(cur)) {
 			printf("[+%s de-referenced]\n", folder);
 			return OK;
@@ -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",
@@ -241,7 +232,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) {