X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpopi.c;h=f522042ef37ea9c5d83a4fcf65b73b26411cf04d;hp=e26e346ee6760503a609d2b12a02eb40d8e6847b;hb=0569d6d1631dc90d4f2f2df6bdd0599c7ecc7814;hpb=99e5043db7ee6cf80f93708610a6e584a8068c6a

diff --git a/uip/popi.c b/uip/popi.c
index e26e346..f522042 100644
--- a/uip/popi.c
+++ b/uip/popi.c
@@ -13,6 +13,7 @@
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
 #include <h/mts.h>
+#include <h/utils.h>
 #include <errno.h>
 
 #ifndef	RPOP
@@ -190,7 +191,7 @@ main (int argc, char **argv)
 	    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);
@@ -228,16 +229,7 @@ main (int argc, char **argv)
 	folder = getfolder (0);
     maildir = m_maildir (folder);
 
-    if (stat (maildir, &st) == NOTOK) {
-	if (errno != ENOENT)
-	    adios (maildir, "error on folder");
-	cp = concat ("Create folder \"", maildir, "\"? ", NULL);
-	if (noisy && !getanswer (cp))
-	    done (1);
-	free (cp);
-	if (!makedir (maildir))
-	    adios (NULL, "unable to create folder %s", maildir);
-    }
+    create_folder(maildir, 0, done);
 
     if (chdir (maildir) == NOTOK)
 	adios (maildir, "unable to change directory to");
@@ -402,8 +394,7 @@ popi (void)
 			if (*dp == '\\' || *dp == '"' || *dp == '\n')
 			    i++;
 		    i++;
-		    if ((ep = malloc ((unsigned) i)) == NULL)
-			adios (NULL, "out of memory");
+		    ep = mh_xmalloc ((unsigned) i);
 		    for (dp = nfs, fp = ep; *dp; dp++) {
 			if (*dp == '\n') {
 			    *fp++ = '\\', *fp++ = 'n';