X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a57e5d9907d845d6f83d2cfdea55cd52efad793f..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index c7e6426c..4558ca30 100644
--- 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: 
@@ -154,7 +154,7 @@ 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))) {
@@ -212,11 +212,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;
 
     /*