X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=string.c;h=b089b785f96a8463bf850b408791987378e69e93;hp=77c90cb3bcee036565751f68ee9b3ff23726bab6;hb=3a51a868784e755c34f19a16970118936fbf299f;hpb=22a0aa79753b19604a6fa4273f1479ef71dbf06d

diff --git a/string.c b/string.c
index 77c90cb..b089b78 100644
--- a/string.c
+++ b/string.c
@@ -138,7 +138,7 @@ __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...)
  * Append \p b to \p a.
  *
  * \return If \a a is \p NULL, return a pointer to a copy of \a b, i.e.
- * para_strcat(NULL, b) is equivalent to para_strdup(b). If \a b is \p NULL,
+ * adu_strcat(NULL, b) is equivalent to adu_strdup(b). If \a b is \p NULL,
  * return \a a without making a copy of \a a.  Otherwise, construct the
  * concatenation \a c, free \a a (but not \a b) and return \a c.
  *
@@ -209,7 +209,7 @@ __must_check int atoi64(const char *str, int64_t *result)
  *
  * \return The number of substrings found in \a args.
  */
-__must_check unsigned split_args(char *args, char *** const argv_ptr, const char *delim)
+unsigned split_args(char *args, char *** const argv_ptr, const char *delim)
 {
 	char *p = args;
 	char **argv;
@@ -373,3 +373,35 @@ err:
 	free(argv);
 	return ret;
 }
+
+char *absolute_path(const char *path)
+{
+	char *cwd, *ap;
+	long int path_max;
+
+	if (!path || !path[0])
+		return NULL;
+	if (path[0] == '/')
+		return adu_strdup(path);
+
+#ifdef PATH_MAX
+	path_max = PATH_MAX;
+#else
+	/*
+	 * The result of pathconf(3) may be huge and unsuitable for mallocing
+	 * memory. OTOH pathconf(3) may return -1 to signify that PATH_MAX is
+	 * not bounded.
+	 */
+	path_max = pathconf(name, _PC_PATH_MAX);
+	if (path_max <= 0 || path_max >= 4096)
+		path_max = 4096;
+#endif
+	cwd = adu_malloc(path_max);
+	if (!getcwd(cwd, path_max)) {
+		free(cwd);
+		return NULL;
+	}
+	ap = make_message("%s/%s", cwd, path);
+	free(cwd);
+	return ap;
+}