X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fali.c;h=9ab6515eba32990a9f3fd1ccf358c8ef6279c807;hp=c6b028cb413eecfe650e29b64051ba5e5e85fdd8;hb=31750e8a12eafcd1b8fa81cb12b988e680254f24;hpb=cf1205b5cbea2f0cd6ea710ec16c637df85b647c

diff --git a/uip/ali.c b/uip/ali.c
index c6b028c..9ab6515 100644
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -125,7 +125,7 @@ main(int argc, char **argv)
 	if (deffiles && (cp = context_find("Aliasfile"))) {
 		char *dp = NULL;
 
-		for (ap = brkstring(dp=getcpy(cp), " ", "\n");
+		for (ap = brkstring(dp=mh_xstrdup(cp), " ", "\n");
 				ap && *ap; ap++) {
 			if ((i = alias(etcpath(*ap))) != AK_OK) {
 				adios(EX_DATAERR, NULL, "aliasing error in %s: %s",
@@ -133,7 +133,7 @@ main(int argc, char **argv)
 			}
 		}
 		if (dp) {
-			free(dp);
+			mh_free0(&dp);
 		}
 	}
 
@@ -210,9 +210,9 @@ print_aka(char *p, int list, int margin)
 static void
 print_usr(char *s, int list, int norm)
 {
-	register char *cp, *pp, *vp;
-	register struct aka *ak;
-	register struct mailname *mp, *np;
+	char *cp, *pp, *vp;
+	struct aka *ak;
+	struct mailname *mp, *np;
 
 	if ((pp = getname(s)) == NULL)
 		adios(EX_DATAERR, NULL, "no address in \"%s\"", s);
@@ -230,7 +230,7 @@ print_usr(char *s, int list, int norm)
 			if (!mh_strcasecmp(mp->m_host, np->m_host)
 					&& !mh_strcasecmp(mp->m_mbox, np->m_mbox)) {
 				vp = vp ? add(ak->ak_name, add(",", vp))
-					: getcpy(ak->ak_name);
+					: mh_xstrdup(ak->ak_name);
 				mnfree(np);
 				while (getname(""))
 					continue;
@@ -244,5 +244,5 @@ print_usr(char *s, int list, int norm)
 	print_aka(vp ? vp : s, list, 0);
 
 	if (vp)
-		free(vp);
+		mh_free0(&vp);
 }