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

diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index 744d3bf..b00f51b 100644
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -76,13 +76,13 @@ akresult(struct aka *ak)
 
 	for (ad = ak->ak_addr; ad; ad = ad->ad_next) {
 		pp = ad->ad_local ? akval(ak->ak_next, ad->ad_text)
-			: getcpy(ad->ad_text);
+			: mh_xstrdup(ad->ad_text);
 
 		if (cp) {
 			dp = cp;
 			cp = concat(cp, ",", pp, NULL);
-			free(dp);
-			free(pp);
+			mh_free0(&dp);
+			mh_free0(&pp);
 		} else
 			cp = pp;
 	}
@@ -103,7 +103,7 @@ akval(struct aka *ak, char *s)
 		if (aleq(s, ak->ak_name))
 			return akresult(ak);
 
-	return getcpy(s);
+	return mh_xstrdup(s);
 }
 
 
@@ -431,8 +431,8 @@ add_aka(struct aka *ak, char *pp)
 		if (strcmp(pp, ad->ad_text)==0)
 			return;
 
-	ad = (struct adr *) mh_xcalloc(1, sizeof(*ad));
-	ad->ad_text = getcpy(pp);
+	ad = mh_xcalloc(1, sizeof(*ad));
+	ad->ad_text = mh_xstrdup(pp);
 	ad->ad_local = strchr(pp, '@') == NULL;
 	ad->ad_next = NULL;
 	if (ak->ak_addr)
@@ -468,9 +468,9 @@ akalloc(char *id)
 {
 	struct aka *p;
 
-	p = (struct aka *) mh_xcalloc(1, sizeof(*p));
+	p = mh_xcalloc(1, sizeof(*p));
 
-	p->ak_name = getcpy(id);
+	p->ak_name = mh_xstrdup(id);
 	p->ak_visible = 0;
 	p->ak_addr = NULL;
 	p->ak_next = NULL;
@@ -489,13 +489,13 @@ hmalloc(struct passwd *pw)
 {
 	struct home *p;
 
-	p = (struct home *) mh_xcalloc(1, sizeof(*p));
+	p = mh_xcalloc(1, sizeof(*p));
 
-	p->h_name = getcpy(pw->pw_name);
+	p->h_name = mh_xstrdup(pw->pw_name);
 	p->h_uid = pw->pw_uid;
 	p->h_gid = pw->pw_gid;
-	p->h_home = getcpy(pw->pw_dir);
-	p->h_shell = getcpy(pw->pw_shell);
+	p->h_home = mh_xstrdup(pw->pw_dir);
+	p->h_shell = mh_xstrdup(pw->pw_shell);
 	p->h_ngrps = 0;
 	p->h_next = NULL;
 	/* append to end */