X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/49976f25a761e67a05cc493cc7ab88863a587e30..665dfc96f45c47ecfae79f1baa2c29dabe5a2ded:/uip/rmf.c diff --git a/uip/rmf.c b/uip/rmf.c index 6a86fe6a..36c7f924 100644 --- a/uip/rmf.c +++ b/uip/rmf.c @@ -1,6 +1,4 @@ - -/* - * rmf.c -- remove a folder +/* rmf.c -- remove a folder * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for @@ -143,7 +141,7 @@ rmf (char *folder) printf ("[+%s de-referenced]\n", folder); return OK; } - advise (NULL, "you have no profile entry for the %s folder +%s", + inform("you have no profile entry for the %s folder +%s", i == NOTOK ? "unreadable" : "read-only", folder); return NOTOK; } @@ -176,7 +174,7 @@ rmf (char *folder) || has_prefix(dp->d_name, BACKUP_PREFIX)) break; - admonish (NULL, "file \"%s/%s\" not deleted", + inform("file \"%s/%s\" not deleted, continuing...", folder, dp->d_name); others++; continue; @@ -201,7 +199,7 @@ rmf (char *folder) if (others == 0 && remdir (maildir)) return OK; - advise (NULL, "folder +%s not removed", folder); + inform("folder +%s not removed", folder); return NOTOK; } @@ -231,7 +229,8 @@ rma (char *folder) && *(np->n_name + j) == '-' && strcmp (cp, np->n_name + j + 1) == 0) { if (!np->n_context) - admonish (NULL, "bug: context_del(key=\"%s\")", np->n_name); + inform("bug: context_del(key=\"%s\"), continuing...", + np->n_name); if (pp) { pp->n_next = np->n_next; np = pp;