X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Ffolder.c;h=3e3cd760804afa8c0bf37974787eb08fa03f39c0;hp=4ffb9f5b18622ee6f7eb93323e0682244a3749b5;hb=dc08e69006fdf9edb458dc23885dd669f3b4a176;hpb=b4987f510fb3494bfc5b11fc92d2047cdb51642b

diff --git a/uip/folder.c b/uip/folder.c
index 4ffb9f5..3e3cd76 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -231,7 +231,7 @@ main(int argc, char **argv)
 			if (argfolder)
 				adios(EX_USAGE, NULL, "only one folder at a time!");
 			else
-				argfolder = getcpy(expandfol(cp));
+				argfolder = mh_xstrdup(expandfol(cp));
 		} else {
 			if (msg)
 				adios(EX_USAGE, NULL, "only one (current) message at a time!");
@@ -255,21 +255,21 @@ main(int argc, char **argv)
 			/* If no folder is given, the current folder and */
 			/* the top of the folder stack are swapped. */
 			if ((cp = context_find(stack))) {
-				dp = getcpy(cp);
+				dp = mh_xstrdup(cp);
 				ap = brkstring(dp, " ", "\n");
-				argfolder = getcpy(*ap++);
+				argfolder = mh_xstrdup(*ap++);
 			} else {
 				adios(EX_USAGE, NULL, "no other folder");
 			}
-			for (cp = getcpy(getcurfol()); *ap; ap++)
+			for (cp = mh_xstrdup(getcurfol()); *ap; ap++)
 				cp = add(*ap, add(" ", cp));
-			free(dp);
+			mh_free0(&dp);
 			context_replace(stack, cp);  /* update folder stack */
 		} else {
 			/* update folder stack */
 			context_replace(stack, (cp = context_find (stack)) ?
 					concat(getcurfol(), " ", cp, NULL) :
-					getcpy(getcurfol()));
+					mh_xstrdup(getcurfol()));
 		}
 	}
 
@@ -278,15 +278,15 @@ main(int argc, char **argv)
 		if (argfolder)
 			adios(EX_USAGE, NULL, "sorry, no folders allowed with -pop");
 		if ((cp = context_find(stack))) {
-			dp = getcpy(cp);
+			dp = mh_xstrdup(cp);
 			ap = brkstring(dp, " ", "\n");
-			argfolder = getcpy(*ap++);
+			argfolder = mh_xstrdup(*ap++);
 		} else {
 			adios(EX_DATAERR, NULL, "folder stack empty");
 		}
 		if (*ap) {
 			/* if there's anything left in the stack */
-			cp = getcpy(*ap++);
+			cp = mh_xstrdup(*ap++);
 			for (; *ap; ap++)
 				cp = add(*ap, add(" ", cp));
 			context_replace(stack, cp);  /* 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);
@@ -310,10 +310,10 @@ main(int argc, char **argv)
 	if (listsw) {
 		printf("%s", argfolder ? argfolder : getcurfol());
 		if ((cp = context_find(stack))) {
-			dp = getcpy(cp);
+			dp = mh_xstrdup(cp);
 			for (ap = brkstring(dp, " ", "\n"); *ap; ap++)
 				printf(" %s", *ap);
-			free(dp);
+			mh_free0(&dp);
 		}
 		printf("\n");
 
@@ -324,7 +324,7 @@ 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