Renamed -version switch to -Version to remove the conflict with -verbose.

[mmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index f214f59..b9c1969 100644 (file)
--- 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);
@@ -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,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) {