X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccan_dir.c;h=6d95e064a5968d463b4528505406a37bd8995029;hp=561488686d34a61d672337d1681b83bb90080e11;hb=5f551788224a3cf0988ae490a807b20292822f20;hpb=10e5e329a1a8804ff6461e1724071364cf6be572

diff --git a/tools/ccan_dir.c b/tools/ccan_dir.c
index 56148868..6d95e064 100644
--- a/tools/ccan_dir.c
+++ b/tools/ccan_dir.c
@@ -1,5 +1,5 @@
-#include <ccan/talloc/talloc.h>
 #include <ccan/err/err.h>
+#include <ccan/tal/path/path.h>
 #include "tools.h"
 #include <assert.h>
 #include <string.h>
@@ -27,14 +27,13 @@ const char *find_ccan_dir(const char *base)
 
 	if (!ccan_dir) {
 		if (base[0] != '/') {
-			const char *tmpctx = talloc_getcwd(NULL);
-			find_ccan_dir(talloc_asprintf(tmpctx, "%s/%s",
-						      tmpctx, base));
-			talloc_free(tmpctx);
+			const char *tmpctx = path_cwd(NULL);
+			find_ccan_dir(path_join(tmpctx, tmpctx, base));
+			tal_free(tmpctx);
 		} else {
 			unsigned int prefix = ccan_dir_prefix(base);
 			if (prefix)
-				ccan_dir = talloc_strndup(NULL, base, prefix);
+				ccan_dir = tal_strndup(NULL, base, prefix);
 		}
 	}
 	return ccan_dir;