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 7d81a39..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 }
@@ -48,26 +48,26 @@ main(int argc, char **argv)
        while ((cp = *argp++)) {
                if (*cp == '-') {
                        switch (smatch(++cp, switches)) {
-                               case AMBIGSW:
-                                       ambigsw(cp, switches);
-                                       done(1);
-                               case UNKWNSW:
-                                       adios(NULL, "-%s unknown", cp);
-
-                               case HELPSW:
-                                       snprintf(buf, sizeof(buf), "%s [+folder] [switches]", invo_name);
-                                       print_help(buf, switches, 1);
-                                       done(1);
-                               case VERSIONSW:
-                                       print_version(invo_name);
-                                       done(1);
-
-                               case INTRSW:
-                                       interactive = 1;
-                                       continue;
-                               case NINTRSW:
-                                       interactive = 0;
-                                       continue;
+                       case AMBIGSW:
+                               ambigsw(cp, switches);
+                               done(1);
+                       case UNKWNSW:
+                               adios(NULL, "-%s unknown", cp);
+
+                       case HELPSW:
+                               snprintf(buf, sizeof(buf), "%s [+folder] [switches]", invo_name);
+                               print_help(buf, switches, 1);
+                               done(1);
+                       case VERSIONSW:
+                               print_version(invo_name);
+                               done(1);
+
+                       case INTRSW:
+                               interactive = 1;
+                               continue;
+                       case NINTRSW:
+                               interactive = 0;
+                               continue;
                        }
                }
                if (*cp == '+' || *cp == '@') {
@@ -92,9 +92,10 @@ main(int argc, char **argv)
                interactive = defolder;
 
        if (strchr(folder, '/') && (*folder != '/') && (*folder != '.')) {
-               for (cp = copy(folder, newfolder);
-                               cp > newfolder && *cp != '/'; cp--)
-                       continue;
+               strcpy(newfolder, folder);
+               cp = newfolder + strlen(newfolder);
+               while (cp > newfolder && *cp != '/')
+                       cp--;
                if (cp > newfolder)
                        *cp = '\0';
                else
@@ -111,11 +112,11 @@ main(int argc, char **argv)
        }
 
        if (rmf(folder) == OK) {
-               char *cfolder = context_find(pfolder);
-               if (cfolder && strcmp(cfolder, newfolder)) {
+               char *cfolder = context_find(curfolder);
+               if (cfolder && strcmp(cfolder, newfolder)!=0) {
                        printf("[+%s now current]\n", newfolder);
                        /* update current folder */
-                       context_replace(pfolder, newfolder);
+                       context_replace(curfolder, newfolder);
                }
        }
        context_save();  /* save the context file */
@@ -133,20 +134,21 @@ rmf(char *folder)
        register DIR *dd;
 
        switch (i = chdir(maildir = toabsdir(folder))) {
-               case OK:
-                       if (access(".", W_OK) != NOTOK &&
-                                       access("..", W_OK) != NOTOK)
-                               break;  /* fall otherwise */
-
-               case NOTOK:
-                       snprintf(cur, sizeof(cur), "atr-%s-%s",
-                                               current, toabsdir(folder));
-                       if (!context_del(cur)) {
-                               printf("[+%s de-referenced]\n", folder);
-                               return OK;
-                       }
-                       advise(NULL, "you have no profile entry for the %s folder +%s", i == NOTOK ? "unreadable" : "read-only", folder);
-                       return NOTOK;
+       case OK:
+               if (access(".", W_OK) != NOTOK && access("..", W_OK) != NOTOK)
+                       break;  /* fall otherwise */
+
+       case NOTOK:
+               snprintf(cur, sizeof(cur), "atr-%s-%s", seq_cur,
+                               toabsdir(folder));
+               if (!context_del(cur)) {
+                       printf("[+%s de-referenced]\n", folder);
+                       return OK;
+               }
+               advise(NULL, "you have no profile entry for the %s folder +%s",
+                               i == NOTOK ? "unreadable" : "read-only",
+                               folder);
+               return NOTOK;
        }
 
        if ((dd = opendir(".")) == NULL)
@@ -157,38 +159,31 @@ rmf(char *folder)
        ** Run the external delete hook program.
        */
 
-       (void)ext_hook("del-hook", maildir, (char *)0);
+       ext_hook("del-hook", maildir, NULL);
 
        j = strlen(backup_prefix);
        while ((dp = readdir(dd))) {
                switch (dp->d_name[0]) {
-                       case '.':
-                               if (strcmp(dp->d_name, ".") == 0 ||
-                                               strcmp(dp->d_name, "..") == 0)
-                                       continue;  /* else fall */
-
-                       case ',':
-#ifdef MHE
-                       case '+':
-#endif /* MHE */
-#ifdef UCI
-                       case '_':
-                       case '#':
-#endif /* UCI */
+               case '.':
+                       if (strcmp(dp->d_name, ".") == 0 ||
+                                       strcmp(dp->d_name, "..") == 0)
+                               continue;  /* else fall */
+
+               case ',':
+                       break;
+
+               default:
+                       if (m_atoi(dp->d_name))
+                               break;
+                       if (strcmp(dp->d_name, altmsglink) == 0 ||
+                                       strncmp(dp->d_name,
+                                       backup_prefix, j) == 0)
                                break;
 
-                       default:
-                               if (m_atoi(dp->d_name))
-                                       break;
-                               if (strcmp(dp->d_name, altmsglink) == 0 ||
-                                               strncmp(dp->d_name,
-                                               backup_prefix, j) == 0)
-                                       break;
-
-                               admonish(NULL, "file \"%s/%s\" not deleted",
-                                               folder, dp->d_name);
-                               others++;
-                               continue;
+                       admonish(NULL, "file \"%s/%s\" not deleted",
+                                       folder, dp->d_name);
+                       others++;
+                       continue;
                }
                if (unlink(dp->d_name) == NOTOK) {
                        admonish(dp->d_name, "unable to unlink %s:", folder);
@@ -239,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) {