X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=string.c;h=fb23d93b29081eb549e4112d0c60f2600c93e9ed;hp=17edffc5e9d9bef56d3f491ac12a83a01c2494cd;hb=560d397a66ba141f18e13557feae78ca94a25f98;hpb=d2ce6e60cb915dff3a0920a0b48f786435bd4ec8

diff --git a/string.c b/string.c
index 17edffc..fb23d93 100644
--- a/string.c
+++ b/string.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2008 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -123,10 +123,28 @@ __must_check __malloc char *adu_strdup(const char *s)
  */
 __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...)
 {
-	char *msg;
+	char *p;
+	int n;
+	size_t size = 100;
 
-	VSPRINTF(fmt, msg);
-	return msg;
+	p = adu_malloc(size);
+	while (1) {
+		va_list ap;
+		/* Try to print in the allocated space. */
+		va_start(ap, fmt);
+		n = vsnprintf(p, size, fmt, ap);
+		va_end(ap);
+		/* If that worked, return the string. */
+		if (n > -1 && n < size)
+			break;
+		/* Else try again with more space. */
+		if (n > -1) /* glibc 2.1 */
+			size = n + 1; /* precisely what is needed */
+		else /* glibc 2.0 */
+			size *= 2; /* twice the old size */
+		p = adu_realloc(p, size);
+	}
+	return p;
 }
 
 /**
@@ -138,7 +156,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.
  *
@@ -202,16 +220,16 @@ __must_check int atoi64(const char *str, int64_t *result)
  * \param argv_ptr Pointer to the list of substrings.
  * \param delim Delimiter.
  *
- * This function modifies \a args by replacing each occurance of \a delim by
+ * This function modifies \a args by replacing each occurrence of \a delim by
  * zero. A \p NULL terminated array of pointers to char* is allocated dynamically
  * and these pointers are initialized to point to the broken-up substrings
  * within \a args. A pointer to this array is returned via \a argv_ptr.
  *
  * \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 *p;
 	char **argv;
 	size_t n = 0, i, j;
 
@@ -340,7 +358,7 @@ void free_argv(char **argv)
  *
  * In contrast to gengetopt's string parser, double quotes, backslash-escaped
  * characters and special characters like \p \\n are honored. The result
- * contains pointers to copies of the words contained in \line and has to be
+ * contains pointers to copies of the words contained in \a line and has to be
  * freed by using \ref free_argv().
  *
  * \param line The line to be split.
@@ -373,3 +391,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;
+}