* man/mhbuild.man: wrapped one appearance of "Content-Disposition"

[mmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index 233a7bf..fb951ed 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -3,6 +3,10 @@
  * rmf.c -- remove a folder
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
@@ -110,9 +114,12 @@ main (int argc, char **argv)
        free (cp);
     }
 
-    if (rmf (folder) == OK && strcmp (context_find (pfolder), newfolder)) {
-       printf ("[+%s now current]\n", newfolder);
-       context_replace (pfolder, newfolder);   /* update current folder */
+    if (rmf (folder) == OK) {
+       char *cfolder = context_find(pfolder);
+       if (cfolder && strcmp (cfolder, newfolder)) {
+           printf ("[+%s now current]\n", newfolder);
+           context_replace (pfolder, newfolder);       /* update current folder */
+       }
     }
     context_save ();   /* save the context file */
     return done (0);
@@ -148,6 +155,12 @@ rmf (char *folder)
        adios (NULL, "unable to read folder +%s", folder);
     others = 0;
 
+    /*
+     * Run the external delete hook program.
+     */
+
+    (void)ext_hook("del-hook", maildir, (char *)0);
+
     j = strlen(BACKUP_PREFIX);
     while ((dp = readdir (dd))) {
        switch (dp->d_name[0]) {
@@ -213,10 +226,6 @@ rma (char *folder)
     register char *cp;
     register struct node *np, *pp;
 
-    /* sanity check - check that context has been read */
-    if (defpath == NULL)
-       adios (NULL, "oops, context hasn't been read yet");
-
     alen = strlen ("atr-");
     plen = strlen (cp = m_mailpath (folder)) + 1;