/*
- * 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.
*/
-/** \file string.c Memory allocation and string handling functions. */
+/** \file string.c \brief Memory allocation and string handling functions. */
#include "adu.h"
#include "string.h"
#include "error.h"
/**
- * Paraslash's version of realloc().
+ * Adu's version of realloc().
*
* \param p Pointer to the memory block, may be \p NULL.
* \param size The desired new size.
}
/**
- * Paraslash's version of malloc().
+ * Adu's version of malloc().
*
* \param size The desired new size.
*
}
/**
- * Paraslash's version of calloc().
+ * Adu's version of calloc().
*
* \param size The desired new size.
*
}
/**
- * Paraslash's version of strdup().
+ * Adu's version of strdup().
*
* \param s The string to be duplicated.
*
*/
__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;
+}
+
+/**
+ * adu's version of strcat().
+ *
+ * \param a String to be appended to.
+ * \param b String to append.
+ *
+ * Append \p b to \p a.
+ *
+ * \return If \a a is \p NULL, return a pointer to a copy of \a b, i.e.
+ * 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.
+ *
+ * \sa strcat(3).
+ */
+__must_check __malloc char *adu_strcat(char *a, const char *b)
+{
+ char *tmp;
+
+ if (!a)
+ return adu_strdup(b);
+ if (!b)
+ return a;
+ tmp = make_message("%s%s", a, b);
+ free(a);
+ return tmp;
}
/** \cond LLONG_MAX and LLONG_LIN might not be defined. */
* Convert a string to a 64-bit signed integer value.
*
* \param str The string to be converted.
- * \param value Result pointer.
+ * \param result Result pointer.
*
* \return Standard.
*
}
/**
- * Split string and return pointers to its parts.
+ * Split a string and return pointers to its parts.
*
* \param args The string to be split.
* \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
- * zero. A \p NULL-terminated array of pointers to char* is allocated dynamically
+ * 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;
return n;
}
-static int check_uid_arg(const char *arg, uint32_t *uid)
-{
- const uint32_t max = ~0U;
- /*
- * we need an 64-bit int for string -> uid conversion because strtoll()
- * returns a signed value.
- */
- int64_t val;
- int ret = atoi64(arg, &val);
-
- if (ret < 0)
- return ret;
- if (val < 0 || val > max)
- return -ERRNO_TO_ERROR(EINVAL);
- *uid = val;
- return 1;
-}
-int parse_uid_range(const char *orig_arg, struct uid_range *ur)
+static int get_next_word(const char *line, char **word)
{
- int ret;
- char *arg = adu_strdup(orig_arg), *p = strchr(arg, '-');
+ enum line_state_flags {LSF_HAVE_WORD = 1, LSF_BACKSLASH = 2,
+ LSF_QUOTE = 4};
+ const char *in;
+ char *out;
+ int ret, state = 0;
- if (!p || p == arg) { /* -42 or 42 */
- ret = check_uid_arg(p? p + 1 : arg, &ur->high);
- if (ret < 0)
- goto out;
- ur->low = p? 0 : ur->high;
- ret = 1;
+ out = adu_malloc(strlen(line) + 1);
+ *out = '\0';
+ *word = out;
+ for (in = line; *in; in++) {
+ switch (*in) {
+ case '\\':
+ if (state & LSF_BACKSLASH) /* \\ */
+ break;
+ state |= LSF_BACKSLASH;
+ state |= LSF_HAVE_WORD;
+ continue;
+ case 'n':
+ case 't':
+ if (state & LSF_BACKSLASH) { /* \n or \t */
+ *out++ = (*in == 'n')? '\n' : '\t';
+ state &= ~LSF_BACKSLASH;
+ continue;
+ }
+ break;
+ case '"':
+ if (state & LSF_BACKSLASH) /* \" */
+ break;
+ if (state & LSF_QUOTE) {
+ state &= ~LSF_QUOTE;
+ continue;
+ }
+ state |= LSF_HAVE_WORD;
+ state |= LSF_QUOTE;
+ continue;
+ case ' ':
+ case '\t':
+ case '\n':
+ if (state & LSF_BACKSLASH)
+ break;
+ if (state & LSF_QUOTE)
+ break;
+ if (state & LSF_HAVE_WORD)
+ goto success;
+ /* ignore space at the beginning */
+ continue;
+ }
+ /* copy char */
+ state |= LSF_HAVE_WORD;
+ *out++ = *in;
+ state &= ~LSF_BACKSLASH;
+ }
+ ret = 0;
+ if (!(state & LSF_HAVE_WORD))
+ goto out;
+ ret = -ERRNO_TO_ERROR(EINVAL);
+ if (state & LSF_BACKSLASH) {
+ ERROR_LOG("trailing backslash\n");
goto out;
}
- /* 42- or 42-4711 */
- *p = '\0';
- p++;
- ret = check_uid_arg(arg, &ur->low);
- if (ret < 0)
+ if (state & LSF_QUOTE) {
+ ERROR_LOG("unmatched quote character\n");
goto out;
- ur->high = ~0U;
- if (*p) { /* 42-4711 */
- ret = check_uid_arg(p, &ur->high);
- if (ret < 0)
- goto out;
}
- if (ur->low > ur->high)
- ret = -ERRNO_TO_ERROR(EINVAL);
+success:
+ *out = '\0';
+ return in - line;
out:
- if (ret < 0)
- ERROR_LOG("bad uid option: %s\n", orig_arg);
- else
- INFO_LOG("admissible uid range: %u - %u\n", ur->low,
- ur->high);
- free(arg);
+ free(*word);
+ *word = NULL;
return ret;
}
-int parse_uid_arg(const char *orig_arg, struct uid_range **ur)
+/**
+ * Free an array of words created by create_argv().
+ *
+ * \param argv A pointer previously obtained by \ref create_argv().
+ */
+void free_argv(char **argv)
+{
+ int i;
+
+ for (i = 0; argv[i]; i++)
+ free(argv[i]);
+ free(argv);
+}
+
+/**
+ * Split a line into words which are separated by whitespace.
+ *
+ * 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 \a line and has to be
+ * freed by using \ref free_argv().
+ *
+ * \param line The line to be split.
+ * \param result The array of words is returned here.
+ *
+ * \return Number of words in \a line, negative on errors.
+ */
+int create_argv(const char *line, char ***result)
{
- char *arg, **argv;
- unsigned n;
- int i, ret = 1;
+ char *word, **argv = adu_malloc(2 * sizeof(char *));
+ const char *p;
+ int ret, num_words;
- if (!orig_arg)
- return 0;
- arg = adu_strdup(orig_arg);
- n = split_args(arg, &argv, ",");
- if (!n)
- return -E_SYNTAX;
- *ur = adu_malloc((n + 1) * sizeof(struct uid_range));
- for (i = 0; i < n; i++) {
- ret = parse_uid_range(argv[i], *ur + i);
+ argv[0] = adu_strdup(line);
+ for (p = line, num_words = 1; ; p += ret, num_words++) {
+ ret = get_next_word(p, &word);
if (ret < 0)
+ goto err;
+ if (!ret)
break;
+ argv = adu_realloc(argv, (num_words + 2) * sizeof(char*));
+ argv[num_words] = word;
}
- free(arg);
- if (ret < 0) {
- free(*ur);
- *ur = NULL;
+ argv[num_words] = NULL;
+ *result = argv;
+ return num_words;
+err:
+ while (num_words > 0)
+ free(argv[--num_words]);
+ 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;
}
- /* an empty range indicates the end of the list */
- (*ur)[n].low = 1;
- (*ur)[n].high = 0;
- return n;
+ ap = make_message("%s/%s", cwd, path);
+ free(cwd);
+ return ap;
}
projects / adu.git / blobdiff