X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=util.c;h=916f0c1830d74a0ea4be9dc56ab4fe448dc07bed;hp=85e87abb4ef8a6a919a2459bd330a0f1f81755ba;hb=2e90d2637abcbea12f5f4070be7a158fb4637604;hpb=eadddde8591e5ab6a8d8dff349affc53d1d4021b

diff --git a/util.c b/util.c
index 85e87ab..916f0c1 100644
--- a/util.c
+++ b/util.c
@@ -9,17 +9,29 @@
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  */
 
 /*
- * 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.
  */
+#define _GNU_SOURCE
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/file.h>
 #include <stdbool.h>
+#include <unistd.h>
 #include <ctype.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
 
-static void *uci_malloc(struct uci_context *ctx, size_t size)
+#include "uci.h"
+#include "uci_internal.h"
+
+__plugin void *uci_malloc(struct uci_context *ctx, size_t size)
 {
 	void *ptr;
 
@@ -31,7 +43,7 @@ static void *uci_malloc(struct uci_context *ctx, size_t size)
 	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)
@@ -40,7 +52,7 @@ static void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
 	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;
 
@@ -51,65 +63,169 @@ static char *uci_strdup(struct uci_context *ctx, const char *str)
 	return ptr;
 }
 
-static bool validate_name(char *str)
+/*
+ * validate strings for names and types, reject special characters
+ * for names, only alphanum and _ is allowed (shell compatibility)
+ * for types, we allow more characters
+ */
+__plugin bool uci_validate_str(const char *str, bool name)
 {
 	if (!*str)
 		return false;
 
 	while (*str) {
-		if (!isalnum(*str) && (*str != '_'))
+		unsigned char c = *str;
+		if (!isalnum(c) && c != '_') {
+			if (name || (c < 33) || (c > 126))
+				return false;
+		}
+		str++;
+	}
+	return true;
+}
+
+bool uci_validate_text(const char *str)
+{
+	while (*str) {
+		unsigned char c = *str;
+		if ((c == '\r') || (c == '\n') ||
+			((c < 32) && (c != '\t')))
 			return false;
 		str++;
 	}
 	return true;
 }
 
-int uci_parse_tuple(struct uci_context *ctx, char *str, char **package, char **section, char **option, char **value)
+__private void uci_alloc_parse_context(struct uci_context *ctx)
+{
+	ctx->pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
+}
+
+int uci_parse_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str)
 {
 	char *last = NULL;
+	char *tmp;
 
 	UCI_HANDLE_ERR(ctx);
-	UCI_ASSERT(ctx, str && package && section && option);
+	UCI_ASSERT(ctx, str);
+	UCI_ASSERT(ctx, ptr);
+
+	memset(ptr, 0, sizeof(struct uci_ptr));
 
-	*package = strtok(str, ".");
-	if (!*package || !validate_name(*package))
+	/* value */
+	last = strchr(str, '=');
+	if (last) {
+		*last = 0;
+		last++;
+		ptr->value = last;
+	}
+
+	ptr->package = strsep(&str, ".");
+	if (!ptr->package)
 		goto error;
 
-	last = *package;
-	*section = strtok(NULL, ".");
-	if (!*section)
+	ptr->section = strsep(&str, ".");
+	if (!ptr->section) {
+		ptr->target = UCI_TYPE_PACKAGE;
 		goto lastval;
+	}
 
-	last = *section;
-	*option = strtok(NULL, ".");
-	if (!*option)
+	ptr->option = strsep(&str, ".");
+	if (!ptr->option) {
+		ptr->target = UCI_TYPE_SECTION;
 		goto lastval;
+	} else {
+		ptr->target = UCI_TYPE_OPTION;
+	}
 
-	last = *option;
+	tmp = strsep(&str, ".");
+	if (tmp)
+		goto error;
 
 lastval:
-	last = strchr(last, '=');
-	if (last) {
-		if (!value)
-			goto error;
+	if (ptr->package && !uci_validate_package(ptr->package))
+		goto error;
+	if (ptr->section && !uci_validate_name(ptr->section))
+		ptr->flags |= UCI_LOOKUP_EXTENDED;
+	if (ptr->option && !uci_validate_name(ptr->option))
+		goto error;
+	if (ptr->value && !uci_validate_text(ptr->value))
+		goto error;
 
-		*last = 0;
-		last++;
-		if (!*last)
-			goto error;
+	return 0;
+
+error:
+	memset(ptr, 0, sizeof(struct uci_ptr));
+	UCI_THROW(ctx, UCI_ERR_PARSE);
+}
+
+
+__private void uci_parse_error(struct uci_context *ctx, char *pos, char *reason)
+{
+	struct uci_parse_context *pctx = ctx->pctx;
+
+	pctx->reason = reason;
+	pctx->byte = pos - pctx->buf;
+	UCI_THROW(ctx, UCI_ERR_PARSE);
+}
+
+
+
+/*
+ * open a stream and go to the right position
+ *
+ * note: when opening for write and seeking to the beginning of
+ * the stream, truncate the file
+ */
+__private FILE *uci_open_stream(struct uci_context *ctx, const char *filename, int pos, bool write, bool create)
+{
+	struct stat statbuf;
+	FILE *file = NULL;
+	int fd, ret;
+	int mode = (write ? O_RDWR : O_RDONLY);
+
+	if (create)
+		mode |= O_CREAT;
+
+	if (!write && ((stat(filename, &statbuf) < 0) ||
+		((statbuf.st_mode &  S_IFMT) != S_IFREG))) {
+		UCI_THROW(ctx, UCI_ERR_NOTFOUND);
 	}
 
-	if (*section && !validate_name(*section))
+	fd = open(filename, mode, UCI_FILEMODE);
+	if (fd < 0)
 		goto error;
-	if (*option && !validate_name(*option))
+
+	ret = flock(fd, (write ? LOCK_EX : LOCK_SH));
+	if ((ret < 0) && (errno != ENOSYS))
 		goto error;
 
-	goto done;
+	ret = lseek(fd, 0, pos);
 
-error:
-	UCI_THROW(ctx, UCI_ERR_PARSE);
+	if (ret < 0)
+		goto error;
 
+	file = fdopen(fd, (write ? "w+" : "r"));
+	if (file)
+		goto done;
+
+error:
+	UCI_THROW(ctx, UCI_ERR_IO);
 done:
-	return 0;
+	return file;
 }
 
+__private void uci_close_stream(FILE *stream)
+{
+	int fd;
+
+	if (!stream)
+		return;
+
+	fflush(stream);
+	fd = fileno(stream);
+	flock(fd, LOCK_UN);
+	fclose(stream);
+}
+
+