X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2Fconfig.c;h=32f0a93b63ee0d5c1b30819e69031874d44f9d65;hb=591e8477b0cd8a038100ac67bed042404f544fde;hp=c099d97fbe022b89c12b0549667210427b38c987;hpb=e637096f7b0a1d73c07ff08d342a6eb2fda2b92e;p=libplp.git

diff --git a/src/config.c b/src/config.c
index c099d97..32f0a93 100644
--- a/src/config.c
+++ b/src/config.c
@@ -4,15 +4,18 @@
 #include <unistd.h>
 #include <uci.h>
 
-#include "log.h"
 #include "config.h"
+#include "log.h"
 
-static int uci_create_named_section(struct uci_context *ctx, const char *conf_file_name, const char *section_type, const char *section_name)
+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;
+	struct uci_ptr	ptr;
+	int		ret_val;
+	char		*cmd_data;
+	int		len;
 
 	ret_val	= -1;
 	if ((ctx != NULL) &&
@@ -26,18 +29,21 @@ static int uci_create_named_section(struct uci_context *ctx, const char *conf_fi
 		len		= len + strlen(section_name);
 		len		= len + 1;
 		cmd_data	= malloc(len);
-		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);
+		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,
+bool set_config_value_to_section(const char *conf_dir_name,
 			const char *conf_file_name,
 			const char *section_type,
 			const char *section_name,
@@ -47,18 +53,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) &&
@@ -91,10 +94,13 @@ bool set_config_value(const char *conf_dir_name,
 						}
 					}
 					if (sct == NULL) {
-						log_debug("Creating configuration section %s to configuration file: %s\n", section_name, fname);
+						log_debug("Creating new 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);
+						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);
@@ -105,46 +111,51 @@ bool set_config_value(const char *conf_dir_name,
 							}
 						}
 					}
-					if (err_flg == 0) {
-						opt	= uci_lookup_option(ctx, sct, key);
-						if (opt != NULL) {
-							memset(&ptr, 0, sizeof(ptr));
-							ptr.package 	= pkg->e.name;
-							ptr.section 	= sct->e.name;
-							ptr.option	= key;
+					if (err_flg == UCI_OK) {
+						memset(&ptr, 0, sizeof(ptr));
+						ptr.package 	= pkg->e.name;
+						ptr.section 	= sct->e.name;
+						ptr.option	= key;
+						err_flg	= uci_lookup_ptr(ctx, &ptr, NULL, false);
+						if (err_flg == UCI_OK) {
+							ptr.value	= value;
+							err_flg		= uci_set(ctx, &ptr);
+							if (err_flg == UCI_OK) {
+								err_flg	= uci_save(ctx, pkg);
+								if (err_flg == UCI_OK) {
+									ret_val	= true;
+									log_debug("Set value to section %s in configuration file: %s\n", section_name, fname);
+								}
+								else {
+									log_error("Failed to set value to configuration file: %s\n. Could not save the file\n", fname);
+								}
 
-							if (uci_lookup_ptr(ctx, &ptr, NULL, false) == UCI_OK) {
-								ptr.value	= strdup(value);
-								uci_set(ctx, &ptr);
-								save	= true;
+							}
+							else {
+								log_error("Failed to set value to configuration file: %s\n. Could not set new value\n", fname);
 							}
 						}
 						else {
-							opt	= uci_alloc_option(sct, key, value);
-							save	= true;
-						}
-						if (save == true) {
-							uci_save(ctx, pkg);
+							log_error("Failed to set value 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);
-						ret_val	= true;
 					}
 					else {
-						log_error("Could not write to configuration file: %s\n. Could not create section %s.", fname, section_name);
+						log_error("Failed to set value to configuration file: %s. Could not create section %s.\n", fname, section_name);
 					}
 				}
 				else {
-					log_error("Could not write to configuration file: %s\n. File does not exist or is not writable.", fname);
+					log_error("Failed to set value to configuration file: %s. File does not exist or is not writable\n.", fname);
 				}
 			}
 			free(fname);
 		}
 		else {
-			log_error("Could not change config value, out of memory");
+			log_error("Failed to set value to configuration file: %s, out of memory\n", fname);
 		}
 	}
 	else {
-		log_error("Could not change config value, invalid parameters");
+		log_error("Failed to set value to configuration file, invalid parameters\n");
 	}
 	return ret_val;
 }