* uip/mhlistsbr.c, uip/mhlsbr.c, uip/picksbr.c: cast

[mmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index fccbb09..c3dcc91 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -78,7 +78,7 @@ main (int argc, char **argv)
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
            if (folder)
                adios (NULL, "only one folder at a time!");
            else

-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);

        } else {
            adios (NULL, "usage: %s [+folder] [switches]", invo_name);
        }
        } else {
            adios (NULL, "usage: %s [+folder] [switches]", invo_name);
        }

@@ -114,12 +114,16 @@ main (int argc, char **argv)
        free (cp);
     }
 
        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 */
     }
     context_save ();   /* save the context file */

-    return done (0);
+    done (0);
+    return 1;

 }
 
 static int
 }
 
 static int

@@ -152,6 +156,12 @@ rmf (char *folder)
        adios (NULL, "unable to read folder +%s", folder);
     others = 0;
 
        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]) {
     j = strlen(BACKUP_PREFIX);
     while ((dp = readdir (dd))) {
        switch (dp->d_name[0]) {

@@ -217,10 +227,6 @@ rma (char *folder)
     register char *cp;
     register struct node *np, *pp;
 
     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;
 
     alen = strlen ("atr-");
     plen = strlen (cp = m_mailpath (folder)) + 1;