X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c6f2d14d9c38345075629af3487c2de491584ca1..44ce2010:/uip/ali.c?ds=inline

diff --git a/uip/ali.c b/uip/ali.c
index abc7f556..fe57ef3e 100644
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -1,6 +1,4 @@
-
-/*
- * ali.c -- list nmh mail aliases
+/* ali.c -- list nmh mail aliases
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -117,11 +115,10 @@ main (int argc, char **argv)
 	if ((cp = context_find ("Aliasfile"))) {
 	    char *dp = NULL;
 
-	    for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap; ap++)
+	    for (ap = brkstring(dp = mh_xstrdup(cp), " ", "\n"); ap && *ap; ap++)
 		if ((i = alias (*ap)) != AK_OK)
 		    adios (NULL, "aliasing error in %s - %s", *ap, akerror (i));
-	    if (dp)
-		free(dp);
+            mh_xfree(dp);
 	}
 	alias (AliasFile);
     }
@@ -144,9 +141,13 @@ main (int argc, char **argv)
 	} else {
 	    /* print them all */
 	    for (ak = akahead; ak; ak = ak->ak_next) {
+                char *res;
+
 		printf ("%s: ", ak->ak_name);
 		pos += strlen (ak->ak_name) + 1;
-		print_aka (akresult (ak), list, pos);
+                res = akresult(ak);
+		print_aka(res, list, pos);
+                free(res);
 	    }
 	}
     }
@@ -162,7 +163,7 @@ print_aka (char *p, int list, int margin)
     char c;
 
     if (p == NULL) {
-	printf ("<empty>\n");
+	puts("<empty>");
 	return;
     }
 
@@ -234,6 +235,5 @@ print_usr (char *s, int list)
 
     print_aka (vp ? vp : s, list, 0);
 
-    if (vp)
-	free (vp);
+    mh_xfree(vp);
 }