Cleanup of .SH NAME sections.

[nmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index 9e922475c6df63ed8cec4fdb3a1ebb3f661bdc78..6a86fe6a9918bafb2b72906fcecf9f0d6fa0ee28 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -8,6 +8,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 #define RMF_SWITCHES \
     X("interactive", 0, INTRSW) \
@@ -37,13 +38,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 = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -97,7 +92,7 @@ main (int argc, char **argv)
        interactive = defolder;
 
     if (strchr (folder, '/') && (*folder != '/') && (*folder != '.')) {
-       for (cp = copy (folder, newfolder); cp > newfolder && *cp != '/'; cp--)
+       for (cp = stpcpy(newfolder, folder); cp > newfolder && *cp != '/'; cp--)
            continue;
        if (cp > newfolder)
            *cp = '\0';
@@ -109,7 +104,7 @@ main (int argc, char **argv)
 
     if (interactive) {
        cp = concat ("Remove folder \"", folder, "\"? ", NULL);
-       if (!getanswer (cp))
+       if (!read_yes_or_no_if_tty (cp))
            done (0);
        free (cp);
     }
@@ -129,16 +124,17 @@ main (int argc, char **argv)
 static int
 rmf (char *folder)
 {
-    int i, j, others;
-    register char *maildir;
+    int i, others;
+    char *maildir;
     char cur[BUFSIZ];
-    register struct dirent *dp;
-    register DIR *dd;
+    struct dirent *dp;
+    DIR *dd;
 
     switch (i = chdir (maildir = m_maildir (folder))) {
        case OK: 
            if (access (".", W_OK) != NOTOK && access ("..", W_OK) != NOTOK)
-               break;          /* fall otherwise */
+               break;
+           /* FALLTHRU */
 
        case NOTOK: 
            snprintf (cur, sizeof(cur), "atr-%s-%s",
@@ -160,15 +156,15 @@ rmf (char *folder)
      * Run the external delete hook program.
      */
 
-    (void)ext_hook("del-hook", maildir, (char *)0);
+    (void)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 */
+                   continue;
+               /* FALLTHRU */
 
            case ',': 
                break;
@@ -177,7 +173,7 @@ rmf (char *folder)
                if (m_atoi (dp->d_name))
                    break;
                if (strcmp (dp->d_name, LINK) == 0
-                       || strncmp (dp->d_name, BACKUP_PREFIX, j) == 0)
+                       || has_prefix(dp->d_name, BACKUP_PREFIX))
                    break;
 
                admonish (NULL, "file \"%s/%s\" not deleted",
@@ -185,7 +181,7 @@ rmf (char *folder)
                others++;
                continue;
        }
-       if (unlink (dp->d_name) == NOTOK) {
+       if (m_unlink (dp->d_name) == NOTOK) {
            admonish (dp->d_name, "unable to unlink %s:", folder);
            others++;
        }
@@ -199,7 +195,9 @@ rmf (char *folder)
      */
     rma (folder);
 
-    chdir ("..");
+    if (chdir ("..") < 0) {
+       advise ("..", "chdir");
+    }
     if (others == 0 && remdir (maildir))
        return OK;
 
@@ -216,11 +214,11 @@ rmf (char *folder)
 static void
 rma (char *folder)
 {
-    register int alen, j, plen;
-    register char *cp;
-    register struct node *np, *pp;
+    int alen, j, plen;
+    char *cp;
+    struct node *np, *pp;
 
-    alen = strlen ("atr-");
+    alen = LEN("atr-");
     plen = strlen (cp = m_mailpath (folder)) + 1;
 
     /*