Commit Diff

Commit:
0b6a92bdb4a65cea5041137d888fe3f401464716
From:
Benjamin Stürz <benni@stuerz.xyz>
Date:
Message:
make: replace some occurences of asprintf()
Actions:
Patch | Tree
commit - 93176f76ce805c8d733e8173c401fa2ac2bdf9c6
commit + 0b6a92bdb4a65cea5041137d888fe3f401464716
blob - 9d10d6571043fe1e077c4525e8e120ac65ed674e
blob + 00b51c7d57c39d636b3cabf3feefde5a7c998661
--- make/make.c
+++ make/make.c
@@ -260,6 +260,18 @@ struct path *old, *comp;
 	return p;
 }
 
+char *
+path_cat_str (dir, file)
+struct path *dir;
+char *file;
+{
+	str_reset ();
+	path_write (dir);
+	str_push ('/');
+	str_push_str (file);
+	return str_get ();
+}
+
 path_write (p)
 struct path *p;
 {
@@ -616,10 +628,9 @@ char *s;
 
 	sub->name = strdup (trim (p));
 
-	asprintf (&path, "%s/%s", path_to_str (dir), sub->name);
+	path = path_cat_str (dir, sub->name);
 	if (access (path, F_OK) != 0)
 		errx (1, "%s: directory not found: %s", path_to_str (dir), sub->name);
-	free (path);
 	
 	p = strtok (NULL, ",");
 	if (p == NULL) {
@@ -797,7 +808,7 @@ char *path;
 			if (*t == '/') {
 				u = t;
 			} else {
-				asprintf (&u, "%s/%s", path_to_str (dir), t);
+				u = strdup (path_cat_str (dir, t));
 			}
 			parse (sc, dir, u);
 			if (u != t)
@@ -892,7 +903,7 @@ struct path *dir;
 {
 	char *path;
 
-	asprintf (&path, "%s/%s", path_to_str (dir), sc->makefile);
+	path = strdup (path_cat_str (dir, sc->makefile));
 	parse (sc, dir, path);
 	free (path);