/*
- * 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.
*/
*/
__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;
}
/**
* 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.
*
* \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;
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;
+}