*/
/*
- * 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>
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)
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, str && package && section && option);
- *package = strtok(str, ".");
+ last = strchr(str, '=');
+ if (last) {
+ *last = 0;
+ last++;
+ }
+
+ *package = strsep(&str, ".");
if (!*package || !uci_validate_name(*package))
goto error;
- last = *package;
- *section = strtok(NULL, ".");
+ *section = strsep(&str, ".");
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 (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)