X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=handler.c;h=f81a7c581510fe6b4dd7613388cafa8dcdbbd3e3;hp=531b509c3f43f508e03e6f84939d2db873db3f22;hb=d788b74c31d95a13630b0d61f69c5bd3eab63ca4;hpb=72adf25cf21490aef012bb9314357f9b381934f9

diff --git a/handler.c b/handler.c
index 531b509..f81a7c5 100644
--- a/handler.c
+++ b/handler.c
@@ -16,7 +16,6 @@
 #include <glob.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <unistd.h>
 
 #include "netifd.h"
 #include "system.h"
@@ -28,14 +27,14 @@ netifd_dir_push(int fd)
 	int prev_fd = open(".", O_RDONLY | O_DIRECTORY);
 	system_fd_set_cloexec(prev_fd);
 	if (fd >= 0)
-		fchdir(fd);
+		if (fchdir(fd)) {}
 	return prev_fd;
 }
 
 static void
 netifd_dir_pop(int prev_fd)
 {
-	fchdir(prev_fd);
+	if (fchdir(prev_fd)) {}
 	close(prev_fd);
 }
 
@@ -140,6 +139,7 @@ netifd_handler_parse_config(struct uci_blob_param_list *config, json_object *obj
 {
 	struct blobmsg_policy *attrs;
 	char *str_buf, *str_cur;
+	char const **validate;
 	int str_len = 0;
 	int i;
 
@@ -148,7 +148,12 @@ netifd_handler_parse_config(struct uci_blob_param_list *config, json_object *obj
 	if (!attrs)
 		return NULL;
 
+	validate = calloc(1, sizeof(char*) * config->n_params);
+	if (!validate)
+		goto error;
+
 	config->params = attrs;
+	config->validate = validate;
 	for (i = 0; i < config->n_params; i++) {
 		json_object *cur, *name, *type;
 
@@ -179,15 +184,25 @@ netifd_handler_parse_config(struct uci_blob_param_list *config, json_object *obj
 	str_cur = str_buf;
 	for (i = 0; i < config->n_params; i++) {
 		const char *name = attrs[i].name;
+		char *delim;
 
 		attrs[i].name = str_cur;
 		str_cur += sprintf(str_cur, "%s", name) + 1;
+		delim = strchr(attrs[i].name, ':');
+		if (delim) {
+			*delim = '\0';
+			validate[i] = ++delim;
+		} else {
+			validate[i] = NULL;
+		}
 	}
 
 	return str_buf;
 
 error:
 	free(attrs);
+	if (validate)
+		free(validate);
 	config->n_params = 0;
 	return NULL;
 }