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

diff --git a/uip/rmf.c b/uip/rmf.c
index f214f59..043ecd6 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -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;
@@ -173,10 +173,6 @@ rmf(char *folder)
 #ifdef MHE
 		case '+':
 #endif /* MHE */
-#ifdef UCI
-		case '_':
-		case '#':
-#endif /* UCI */
 			break;
 
 		default:
@@ -241,7 +237,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) {