X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frefile.c;h=bb7f00a119b332a8ddebab963467e9bb2307bc81;hp=f3c6d1f0ca27fc3315d2c1dac5cae159d240b6de;hb=fb49dd82ec42997b9df97f221c920f6596102c0a;hpb=a753601a3811c10e433dbb04d8211a3df4b99012

diff --git a/uip/refile.c b/uip/refile.c
index f3c6d1f..bb7f00a 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -11,6 +11,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 #include <fcntl.h>
 #include <errno.h>
 
@@ -97,8 +98,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
@@ -185,9 +185,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;
 	}
@@ -313,16 +312,7 @@ opnfolds (struct st_fold *folders, int nfolders)
 	chdir (m_maildir (""));
 	strncpy (nmaildir, m_maildir (fp->f_name), sizeof(nmaildir));
 
-	if (stat (nmaildir, &st) == NOTOK) {
-	    if (errno != ENOENT)
-		adios (nmaildir, "error on folder");
-	    cp = concat ("Create folder \"", nmaildir, "\"? ", NULL);
-	    if (!getanswer (cp))
-		done (1);
-	    free (cp);
-	    if (!makedir (nmaildir))
-		adios (NULL, "unable to create folder %s", nmaildir);
-	}
+    create_folder (nmaildir, 0, done);
 
 	if (chdir (nmaildir) == NOTOK)
 	    adios (nmaildir, "unable to change directory to");