Cleaned up a bit, mostly in comments for each function.

[nmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index 765ec9e19851e176413c9c3c05ccc2f7bc687f9e..f714c472bcbb40b5fbfa9b3ff78f0c0545d24a0b 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);
     }
@@ -179,7 +179,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++;
        }
@@ -193,7 +193,9 @@ rmf (char *folder)
      */
     rma (folder);
 
-    chdir ("..");
+    if (chdir ("..") < 0) {
+       advise ("..", "chdir");
+    }
     if (others == 0 && remdir (maildir))
        return OK;