X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Ffolder.c;h=b7cdfe54d132448fed24aa48c50324e1689155c2;hp=b4758cf4305821883ae169d0ddf19557ca7f0bf6;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=10eff860a28b96582526eb739fd0a55441669938

diff --git a/uip/folder.c b/uip/folder.c
index b4758cf..b7cdfe5 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -64,6 +64,8 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
+
 static int fshort   = 0;  /* output only folder names */
 static int fcreat   = 0;  /* should we ask to create new folders? */
 static int fpack    = 0;  /* are we packing the folder? */
@@ -231,7 +233,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 +257,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 +280,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 +296,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 +312,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");