Added support for optional Content_Disposition header in mhbuild directive.s

[mmh] / uip / rmm.c

diff --git a/uip/rmm.c b/uip/rmm.c
index a18c278..b9fd80d 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -10,6 +10,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 /*
  * We allocate space for message names and ranges
@@ -56,8 +57,7 @@ main (int argc, char **argv)
      */
     nummsgs = 0;
     maxmsgs = MAXMSGS;
-    if (!(msgs = (char **) malloc ((size_t) (maxmsgs * sizeof(*msgs)))))
-       adios (NULL, "unable to allocate storage");
+    msgs = (char **) mh_xmalloc ((size_t) (maxmsgs * sizeof(*msgs)));
 
     /* parse arguments */
     while ((cp = *argp++)) {
@@ -98,9 +98,8 @@ main (int argc, char **argv)
             */
            if (nummsgs >= maxmsgs){
                maxmsgs += MAXMSGS;
-               if (!(msgs = (char **) realloc (msgs,
-                            (size_t) (maxmsgs * sizeof(*msgs)))))
-                   adios (NULL, "unable to reallocate msgs storage");
+               msgs = (char **) mh_xrealloc (msgs,
+                   (size_t) (maxmsgs * sizeof(*msgs)));
            }
            msgs[nummsgs++] = cp;
        }
@@ -145,7 +144,7 @@ main (int argc, char **argv)
     }
 
     /* "remove" the SELECTED messages */
-    folder_delmsgs (mp, unlink_msgs);
+    folder_delmsgs (mp, unlink_msgs, 0);
 
     seq_save (mp);             /* synchronize message sequences  */
     context_replace (pfolder, folder); /* update current folder   */