Oops, should have offset file in showbuildenv rather than cat.

[nmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index bb03805a1b1300fb5e3dd344b456133c131a1e79..f6cb4e829fdcfcfd55d2ec3eb898a3d42502ba54 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -103,7 +103,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);
     }
@@ -124,10 +124,10 @@ static int
 rmf (char *folder)
 {
     int i, j, others;
-    register char *maildir;
+    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: 
@@ -193,7 +193,9 @@ rmf (char *folder)
      */
     rma (folder);
 
-    chdir ("..");
+    if (chdir ("..") < 0) {
+       advise ("..", "chdir");
+    }
     if (others == 0 && remdir (maildir))
        return OK;
 
@@ -210,9 +212,9 @@ 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-");
     plen = strlen (cp = m_mailpath (folder)) + 1;