X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Ffolder.c;h=c8b3c60d656d5744ada3f9a6e443910ce5291587;hb=d4c34b4439a9dbd89664de460ed37ecddc260fb1;hp=3ca0e7db23c72aaaa5330f8da3b01d90ee9bfa72;hpb=5ba9c2f13fedf1d8d6ed907ef1f505616290efaa;p=mmh

diff --git a/uip/folder.c b/uip/folder.c
index 3ca0e7d..c8b3c60 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -263,7 +263,7 @@ main(int argc, char **argv)
 			}
 			for (cp = getcpy(getcurfol()); *ap; ap++)
 				cp = add(*ap, add(" ", cp));
-			free(dp);
+			mh_free0(&dp);
 			context_replace(stack, cp);  /* update folder stack */
 		} else {
 			/* update folder stack */
@@ -294,7 +294,7 @@ main(int argc, char **argv)
 			/* delete folder stack entry from context */
 			context_del(stack);
 		}
-		free(dp);
+		mh_free0(&dp);
 	}
 	if (pushsw || popsw) {
 		cp = toabsdir(argfolder);
@@ -313,7 +313,7 @@ main(int argc, char **argv)
 			dp = getcpy(cp);
 			for (ap = brkstring(dp, " ", "\n"); *ap; ap++)
 				printf(" %s", *ap);
-			free(dp);
+			mh_free0(&dp);
 		}
 		printf("\n");
 
@@ -324,21 +324,22 @@ main(int argc, char **argv)
 
 	/* Allocate initial space to record folder information */
 	maxFolderInfo = CRAWL_NUMFOLDERS;
-	fi = mh_xmalloc(maxFolderInfo * sizeof(*fi));
+	fi = mh_xcalloc(maxFolderInfo, sizeof(*fi));
 
 	/*
 	** Scan the folders
 	*/
+	/*
+	** change directory to base of nmh directory for
+	** crawl_folders
+	*/
+	if (chdir(nmhdir) == NOTOK) {
+		adios(EX_OSERR, nmhdir, "unable to change directory to");
+	}
 	if (all || ftotal > 0) {
 		/*
 		** If no folder is given, do them all
 		*/
-		/*
-		** change directory to base of nmh directory for
-		** crawl_folders
-		*/
-		if (chdir(nmhdir) == NOTOK)
-			adios(EX_OSERR, nmhdir, "unable to change directory to");
 		if (!argfolder) {
 			if (msg)
 				admonish(NULL, "no folder given for message %s", msg);