X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2Fconfig.c;h=4e51b43ca78db17ddc946968775567b2b6df2adf;hb=6eb270983373b863deeca1497b56fcb1d23f2c2b;hp=0b0994439e1db484683273d2ea21cecda3517a4b;hpb=c2adfd4e17d4fb0c1c16d3bcf96dbd6ccb798753;p=libplp.git

diff --git a/src/config.c b/src/config.c
index 0b09944..4e51b43 100644
--- a/src/config.c
+++ b/src/config.c
@@ -7,6 +7,39 @@
 #include "log.h"
 #include "config.h"
 
+static int uci_create_named_section(struct uci_context *ctx, const char *conf_file_name, const char *section_type, const char *section_name)
+{
+	struct uci_ptr		ptr;
+	int			ret_val;
+	char			*cmd_data;
+	int			len;
+
+	ret_val	= -1;
+	if ((ctx != NULL) &&
+	    (conf_file_name != NULL) &&
+	    (section_type != NULL) &&
+	    (section_name != NULL)) {
+		len		= strlen(conf_file_name);
+		len		= len + 1;
+		len		= len + strlen(section_type);
+		len		= len + 1;
+		len		= len + strlen(section_name);
+		len		= len + 1;
+		cmd_data	= malloc(len);
+		if (cmd_data != NULL) {
+			snprintf(cmd_data, len, "%s.%s=%s", conf_file_name, section_name, section_type);
+			if (uci_lookup_ptr(ctx, &ptr, cmd_data, true) == UCI_OK) {
+				ret_val	= uci_set(ctx, &ptr);
+				if (ret_val == UCI_OK) {
+					//ret_val	= uci_save(ctx, ptr.p);
+				}
+			}
+			free(cmd_data);
+		}
+	}
+	return ret_val;
+}
+
 bool set_config_value(const char *conf_dir_name,
 			const char *conf_file_name,
 			const char *section_type,
@@ -17,15 +50,15 @@ bool set_config_value(const char *conf_dir_name,
 	struct uci_package 	*pkg;
 	struct uci_section 	*sct;
 	struct uci_section 	*tmp_sct;
-	struct uci_option	*opt;
 	int			err_flg;
 	char			*fname;
 	int			b_count;
-	bool			save;
+	struct uci_element	*elem;
+	struct uci_ptr		ptr;
+	FILE			*fp;
 	bool			ret_val;
 
 	ret_val	= false;
-	save	= false;
 	if ((conf_dir_name != NULL) &&
 	    (conf_file_name != NULL) &&
 	    (section_type != NULL) &&
@@ -39,64 +72,73 @@ bool set_config_value(const char *conf_dir_name,
 			strncat(fname, "/", 1);
 			strncat(fname, conf_file_name, strlen(conf_file_name) + 1);
 			ctx	= uci_alloc_context();
-			sct	= NULL;
-			uci_set_confdir(ctx, conf_dir_name);
-			if (access(fname, F_OK) != 0) {
-				FILE *fp;
-
-				fp	= fopen(fname, "w+");
-				fclose(fp);
-			}
-			err_flg	= uci_load(ctx, fname, &pkg);
-			struct uci_element *e;
-			uci_foreach_element(&pkg->sections, e) {
-				tmp_sct	= uci_to_section(e);
-				if (strcmp(tmp_sct->type, section_type) == 0) {
-					sct	= tmp_sct;
-					break;
+			if (ctx != NULL) {
+				sct	= NULL;
+				uci_set_confdir(ctx, conf_dir_name);
+				if (access(fname, W_OK) != 0) {
+					if (access(fname, F_OK) != 0) {
+						fp	= fopen(fname, "w+");
+						fclose(fp);
+					}
 				}
-			}
-			//sct	= uci_lookup_section(ctx, pkg, "service");
-			if (sct != NULL) {
-				log_debug("section found\n");
-			}
-			else {
-				log_debug("adding new section\n");
-				err_flg	= uci_add_named_section(ctx, pkg, section_type, section_name, &sct);
-				log_debug("err_flg: %d, section name: %s\n", err_flg, sct->e.name);
-			}
-			opt	= uci_lookup_option(ctx, sct, key);
-			if (opt != NULL) {
-				struct uci_ptr ptr;
-				memset(&ptr, 0, sizeof(ptr));
-				ptr.package 	= pkg->e.name;
-				ptr.section 	= sct->e.name;
-				ptr.option	= key;
+				if (access(fname, W_OK) == 0) {
+					err_flg	= uci_load(ctx, fname, &pkg);
+					uci_foreach_element(&pkg->sections, elem) {
+						tmp_sct	= uci_to_section(elem);
+						if (strcmp(tmp_sct->type, section_type) == 0) {
+							sct	= tmp_sct;
+							break;
+						}
+					}
+					if (sct == NULL) {
+						log_debug("Creating configuration section %s to configuration file: %s\n", section_name, fname);
+						//err_flg	= uci_add_named_section(ctx, pkg, section_type, section_name, &sct);
+						//err_flg	= uci_add_section(ctx, pkg, section_name, &sct);
+						err_flg	= uci_create_named_section(ctx, conf_file_name, section_type, section_name);
+						if (err_flg == UCI_OK) {
+							uci_foreach_element(&pkg->sections, elem) {
+								tmp_sct	= uci_to_section(elem);
+								if (strcmp(tmp_sct->type, section_type) == 0) {
+									sct	= tmp_sct;
+									break;
+								}
+							}
+						}
+					}
+					if (err_flg == 0) {
+						memset(&ptr, 0, sizeof(ptr));
+						ptr.package 	= pkg->e.name;
+						ptr.section 	= sct->e.name;
+						ptr.option	= key;
 
-				if (uci_lookup_ptr(ctx, &ptr, NULL, false) == UCI_OK) {
-					log_debug("trying to change option value\n");
-					ptr.value	= strdup(value);
-					uci_set(ctx, &ptr);
-					save		= true;
+						if (uci_lookup_ptr(ctx, &ptr, NULL, false) == UCI_OK) {
+							ptr.value	= value;
+							uci_set(ctx, &ptr);
+							uci_save(ctx, pkg);
+							ret_val		= true;
+							log_debug("Created configuration section %s to configuration file: %s\n", section_name, fname);
+						}
+						else {
+							log_error("Could not write to configuration file: %s\n. Could not look-up pointer for package %s section %s.\n", fname, pkg->e.name, sct->e.name);
+						}
+						uci_free_context(ctx);
+					}
+					else {
+						log_error("Could not write to configuration file: %s. Could not create section %s.\n", fname, section_name);
+					}
+				}
+				else {
+					log_error("Could not write to configuration file: %s. File does not exist or is not writable\n.", fname);
 				}
-			}
-			else {
-				opt	= uci_alloc_option(sct, key, value);
-				save	= true;
-			}
-			if (save == true) {
-				log_debug("saving config file: %s\n", fname);
-				uci_save(ctx, pkg);
 			}
 			free(fname);
-			ret_val	= true;
 		}
 		else {
-			log_error("Could not change config value, out of memory");
+			log_error("Could not change config value, out of memory\n");
 		}
 	}
 	else {
-		log_error("Could not change config value, invalid parameters");
+		log_error("Could not change config value, invalid parameters\n");
 	}
 	return ret_val;
 }