Merge tag '1.6' into since

Version 1.6

1 files changed, 52 insertions, 0 deletions

diff --git a/abspath.c b/abspath.c
new file mode 100644
index 0000000..7cc936b
--- /dev/null
+++ b/abspath.c
@@ -0,0 +1,52 @@
+/* See LICENSE file for copyright and license details. */
+#include "common.h"
+#ifndef TEST
+
+
+char *
+libsimple_abspath(const char *path, const char *relto)
+{
+	size_t size;
+	int add_slash;
+	char *p, *ret, *relto_free = NULL;
+
+	if (*path == '/') {
+		ret = strdup(path);
+		return ret;
+	}
+
+	while (path[0] == '.' && path[1] == '/')
+		path = &path[2];
+
+	if (!relto) {
+		relto_free = libsimple_getcwd();
+		if (!relto_free)
+			return NULL;
+		relto = relto_free;
+	}
+
+	add_slash = (strchr(relto, '\0')[-1] != '/');
+	size = strlen(relto) + strlen(path) + (size_t)(1 + add_slash);
+
+	ret = malloc(size);
+	if (ret) {
+		p = stpcpy(ret, relto);
+		if (add_slash)
+			*p++ = '/';
+		stpcpy(p, path);
+	}
+	free(relto_free);
+	return ret;
+}
+
+
+#else
+#include "test.h"
+
+int
+main(void) /* TODO test */
+{
+	return 0;
+}
+
+#endif