*/
/*
- * This file contains wrappers to standard functions, which
- * throw exceptions upon failure.
+ * This file contains misc utility functions and wrappers to standard
+ * functions, which throw exceptions upon failure.
*/
#include <sys/types.h>
#include <sys/stat.h>
#define LINEBUF 32
#define LINEBUF_MAX 4096
-static void *uci_malloc(struct uci_context *ctx, size_t size)
+__plugin void *uci_malloc(struct uci_context *ctx, size_t size)
{
void *ptr;
return ptr;
}
-static void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
+__plugin void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
{
ptr = realloc(ptr, size);
if (!ptr)
return ptr;
}
-static char *uci_strdup(struct uci_context *ctx, const char *str)
+__plugin char *uci_strdup(struct uci_context *ctx, const char *str)
{
char *ptr;
return ptr;
}
+/* Based on an efficient hash function published by D. J. Bernstein */
+static unsigned int djbhash(unsigned int hash, char *str)
+{
+ int len = strlen(str);
+ int i;
+
+ /* initial value */
+ if (hash == ~0)
+ hash = 5381;
+
+ for(i = 0; i < len; i++) {
+ hash = ((hash << 5) + hash) + str[i];
+ }
+ return (hash & 0x7FFFFFFF);
+}
+
/*
* validate strings for names and types, reject special characters
* for names, only alphanum and _ is allowed (shell compatibility)
* for types, we allow more characters
*/
-static bool uci_validate_str(const char *str, bool name)
+__plugin bool uci_validate_str(const char *str, bool name)
{
if (!*str)
return false;
return uci_validate_str(str, true);
}
+static inline bool uci_validate_text(const char *str)
+{
+ while (*str) {
+ if ((*str == '\r') || (*str == '\n') ||
+ ((*str < 32) && (*str != '\t')))
+ return false;
+ str++;
+ }
+ return true;
+}
+
static void uci_alloc_parse_context(struct uci_context *ctx)
{
ctx->pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, str && package && section && option);
- *package = strtok(str, ".");
- if (!*package || !uci_validate_name(*package))
+ last = strchr(str, '=');
+ if (last) {
+ *last = 0;
+ last++;
+ }
+
+ *package = strsep(&str, ".");
+ if (!*package || !uci_validate_str(*package, false))
goto error;
- last = *package;
- *section = strtok(NULL, ".");
+ *section = strsep(&str, ".");
+ *option = NULL;
+ if (value)
+ *value = NULL;
if (!*section)
goto lastval;
- last = *section;
- *option = strtok(NULL, ".");
+ *option = strsep(&str, ".");
if (!*option)
goto lastval;
- last = *option;
-
lastval:
- last = strchr(last, '=');
if (last) {
if (!value)
goto error;
- *last = 0;
- last++;
if (!*last)
goto error;
*value = last;
}
- if (*section && !uci_validate_name(*section))
+ if (*section && *section[0] && !uci_validate_name(*section))
goto error;
if (*option && !uci_validate_name(*option))
goto error;
+ if (value && *value && !uci_validate_text(*value))
+ goto error;
goto done;
*/
static void parse_str(struct uci_context *ctx, char **str, char **target)
{
+ bool next = true;
do {
switch(**str) {
case '\'':
/* fall through */
case 0:
goto done;
+ case ';':
+ next = false;
+ goto done;
case '\\':
if (!parse_backslash(ctx, str))
continue;
* character, skip to the next one, because the whitespace will
* be overwritten by a null byte here
*/
- if (**str)
+ if (**str && next)
*str += 1;
/* terminate the parsed string */
val = ptr = *str;
skip_whitespace(ctx, str);
- parse_str(ctx, str, &ptr);
+ if(*str[0] == ';') {
+ *str[0] = 0;
+ *str += 1;
+ } else {
+ parse_str(ctx, str, &ptr);
+ }
if (!*val) {
if (required)
uci_parse_error(ctx, *str, "insufficient arguments");
if (ctx->pctx) {
if (ctx->pctx->file != stream) {
- ctx->internal = true;
uci_cleanup(ctx);
}
} else {
}
fd = open(filename, mode, UCI_FILEMODE);
- if (fd <= 0)
+ if (fd < 0)
goto error;
if (flock(fd, (write ? LOCK_EX : LOCK_SH)) < 0)