Removed configure flag --disable-locale and have it always enabled.

[mmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index 923f23a..05b3e96 100644 (file)
--- 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 }
@@ -34,9 +34,7 @@ main(int argc, char **argv)
        char *cp, *folder = NULL, newfolder[BUFSIZ];
        char buf[BUFSIZ], **argp, **arguments;
 
-#ifdef LOCALE
        setlocale(LC_ALL, "");
-#endif
        invo_name = mhbasename(argv[0]);
 
        /* read user profile/context */
@@ -113,7 +111,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,21 +168,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 +230,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) {