X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Flicense_exists.c;h=3482bfee7745d6913a76380e8648a18695e62d65;hp=6305d61c02881a7fef67780d58067f1c80a2c9b0;hb=HEAD;hpb=10e5e329a1a8804ff6461e1724071364cf6be572

diff --git a/tools/ccanlint/tests/license_exists.c b/tools/ccanlint/tests/license_exists.c
index 6305d61c..3482bfee 100644
--- a/tools/ccanlint/tests/license_exists.c
+++ b/tools/ccanlint/tests/license_exists.c
@@ -1,4 +1,7 @@
 #include <tools/ccanlint/ccanlint.h>
+#include <ccan/tal/tal.h>
+#include <ccan/tal/str/str.h>
+#include <ccan/tal/path/path.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -8,22 +11,23 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <err.h>
-#include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
+#include <ccan/take/take.h>
 
 /* We might need more ../ for nested modules. */
 static const char *link_prefix(struct manifest *m)
 {
-	char *prefix = talloc_strdup(m, "../../");
+	char *prefix = tal_strdup(m, "../../");
 	unsigned int i;
 
 	for (i = 0; i < strcount(m->modname, "/"); i++)
-		prefix = talloc_append_string(prefix, "../");
+		prefix = tal_strcat(m, take(prefix), "../");
 
-	return talloc_append_string(prefix, "licenses/");
+	return tal_strcat(m, take(prefix), "licenses/");
 }
 
-static const char *expected_link(const char *prefix, enum license license)
+static const char *expected_link(const tal_t *ctx,
+				 const char *prefix, enum license license)
 {
 	const char *shortname;
 
@@ -63,15 +67,15 @@ static const char *expected_link(const char *prefix, enum license license)
 		return NULL;
 	}
 
-	return talloc_append_string(talloc_strdup(prefix, prefix), shortname);
+	return tal_strcat(ctx, prefix, shortname);
 }
 
 static void handle_license_link(struct manifest *m, struct score *score)
 {
 	struct doc_section *d = find_license_tag(m);
 	const char *prefix = link_prefix(m);
-	const char *link = talloc_asprintf(m, "%s/LICENSE", m->dir);
-	const char *ldest = expected_link(prefix, m->license);
+	const char *link = path_join(m, m->dir, "LICENSE");
+	const char *ldest = expected_link(score, prefix, m->license);
 	char *q;
 
 	printf(
@@ -79,8 +83,8 @@ static void handle_license_link(struct manifest *m, struct score *score)
 	"LICENSE symlink into %s to avoid too many copies.\n", prefix);
 
 	/* FIXME: make ask printf-like */
-	q = talloc_asprintf(m, "Set up link to %s (license is %s)?",
-			    ldest, d->lines[0]);
+	q = tal_fmt(m, "Set up link to %s (license is %s)?",
+		    ldest, d->lines[0]);
 	if (ask(q)) {
 		if (symlink(ldest, link) != 0)
 			err(1, "Creating symlink %s -> %s", link, ldest);
@@ -90,18 +94,19 @@ static void handle_license_link(struct manifest *m, struct score *score)
 extern struct ccanlint license_exists;
 
 static void check_has_license(struct manifest *m,
-			      unsigned int *timeleft, struct score *score)
+			      unsigned int *timeleft UNNEEDED,
+			      struct score *score)
 {
 	char buf[PATH_MAX];
 	ssize_t len;
-	char *license = talloc_asprintf(m, "%s/LICENSE", m->dir);
+	char *license = path_join(m, m->dir, "LICENSE");
 	const char *expected;
 	struct doc_section *d;
 	const char *prefix = link_prefix(m);
 
 	d = find_license_tag(m);
 	if (!d) {
-		score->error = talloc_strdup(score, "No License: tag in _info");
+		score->error = tal_strdup(score, "No License: tag in _info");
 		return;
 	}
 
@@ -118,7 +123,7 @@ static void check_has_license(struct manifest *m,
 	/* If they have a license tag at all, we pass. */
 	score->pass = true;
 
-	expected = expected_link(prefix, m->license);
+	expected = expected_link(m, prefix, m->license);
 
 	len = readlink(license, buf, sizeof(buf));
 	if (len < 0) {
@@ -129,7 +134,7 @@ static void check_has_license(struct manifest *m,
 				return;
 			}
 			score->error
-				= talloc_asprintf(score,
+				= tal_fmt(score,
 					  "License in _info is '%s',"
 					  " expect LICENSE symlink '%s'",
 					  d->lines[0], expected);
@@ -141,7 +146,7 @@ static void check_has_license(struct manifest *m,
 				score->score = score->total;
 				return;
 			}
-			score->error = talloc_strdup(score,
+			score->error = tal_strdup(score,
 						     "LICENSE does not exist");
 			if (expected)
 				license_exists.handle = handle_license_link;
@@ -155,22 +160,22 @@ static void check_has_license(struct manifest *m,
 	buf[len] = '\0';
 
 	if (!strstarts(buf, prefix)) {
-		score->error = talloc_asprintf(score,
-					       "Expected symlink into"
-					       " %s not %s", prefix, buf);
+		score->error = tal_fmt(score,
+				       "Expected symlink into %s not %s",
+				       prefix, buf);
 		return;
 	}
 
 	if (!expected) {
-		score->error = talloc_asprintf(score,
-					  "License in _info is unknown '%s',"
-					  " but LICENSE symlink is '%s'",
-					  d->lines[0], buf);
+		score->error = tal_fmt(score,
+				       "License in _info is unknown '%s',"
+				       " but LICENSE symlink is '%s'",
+				       d->lines[0], buf);
 		return;
 	}
 
 	if (!streq(buf, expected)) {
-		score->error = talloc_asprintf(score,
+		score->error = tal_fmt(score,
 				       "Expected symlink to %s not %s",
 				       expected, buf);
 		return;