lib: simplify include_path()

Align the path resolving logic with compiler.c and use strrchr() and a
width limited printf pattern to extract the directory name portion.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

1 files changed, 4 insertions, 11 deletions

diff --git a/lib.c b/lib.c
index 1cbde6d..4c9ff81 100644
--- a/lib.c
+++ b/lib.c
@@ -2324,19 +2324,12 @@ include_path(const char *curpath, const char *incpath)
 	if (*incpath == '/')
 		return realpath(incpath, NULL);
 
-	if (curpath) {
-		dup = strdup(curpath);
+	dup = curpath ? strrchr(curpath, '/') : NULL;
 
-		if (!dup)
-			return NULL;
-
-		len = asprintf(&res, "%s/%s", dirname(dup), incpath);
-
-		free(dup);
-	}
-	else {
+	if (dup)
+		len = asprintf(&res, "%.*s/%s", (int)(dup - curpath), curpath, incpath);
+	else
 		len = asprintf(&res, "./%s", incpath);
-	}
 
 	if (len == -1)
 		return NULL;