X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2Fconfig.c;h=9c479a0e255e70c8dac7c6217849cc6c4d49ca79;hb=860d8c023b82eeca9833d4a3f534c6d11a9523f3;hp=0b0994439e1db484683273d2ea21cecda3517a4b;hpb=c2adfd4e17d4fb0c1c16d3bcf96dbd6ccb798753;p=libplp.git diff --git a/src/config.c b/src/config.c index 0b09944..9c479a0 100644 --- a/src/config.c +++ b/src/config.c @@ -4,99 +4,150 @@ #include #include -#include "log.h" +#include "private/uci_config.h" #include "config.h" +#include "log.h" -bool set_config_value(const char *conf_dir_name, - const char *conf_file_name, +bool set_config_value_and_save(const char *conf_dir_name, + const char *conf_file_basename, const char *section_type, const char *section_name, const char *key, const char *value) { struct uci_context *ctx; struct uci_package *pkg; - struct uci_section *sct; - struct uci_section *tmp_sct; - struct uci_option *opt; int err_flg; - char *fname; + char *conf_fname_full; int b_count; - bool save; + FILE *fp; bool ret_val; ret_val = false; - save = false; + pkg = NULL; if ((conf_dir_name != NULL) && - (conf_file_name != NULL) && + (conf_file_basename != NULL) && (section_type != NULL) && (section_name != NULL) && (key != NULL) && (value != NULL)) { - b_count = strlen(conf_dir_name) + strlen(conf_file_name) + 10; - fname = (char *)calloc(1, b_count); - if (fname != NULL) { - strncpy(fname, conf_dir_name, b_count); - strncat(fname, "/", 1); - strncat(fname, conf_file_name, strlen(conf_file_name) + 1); + b_count = strlen(conf_dir_name) + strlen(conf_file_basename) + 10; + conf_fname_full = (char *)calloc(1, b_count); + if (conf_fname_full != NULL) { + strncpy(conf_fname_full, conf_dir_name, b_count); + strncat(conf_fname_full, "/", 1); + strncat(conf_fname_full, conf_file_basename, strlen(conf_file_basename) + 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) { + if (access(conf_fname_full, W_OK) != 0) { + // if file is not writable, try to change it to be writable + if (access(conf_fname_full, F_OK) != 0) { + fp = fopen(conf_fname_full, "w+"); + fclose(fp); + } } + if (access(conf_fname_full, W_OK) == 0) { + uci_set_confdir(ctx, + conf_dir_name); + err_flg = uci_load(ctx, conf_fname_full, &pkg); + if ((err_flg == UCI_OK) && + (pkg != NULL)) { + ret_val = uci_set_config_value(ctx, + pkg, + conf_file_basename, + conf_fname_full, + section_type, + section_name, + key, + value, + true); + } + else { + log_error("Failed to set value to configuration file: %s. Could not load current file content.\n", conf_fname_full); + } + } + else { + log_error("Failed to set value to configuration file: %s. File does not exist or is not writable\n", conf_fname_full); + } + //TODO: uci_free_package(pkg) ?, or will uci_free_contect(ctx) also free the package + uci_free_context(ctx); } - //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; + free(conf_fname_full); + } + else { + log_error("Failed to set value to configuration file: %s/%s, out of memory\n", conf_dir_name, conf_file_basename); + } + } + else { + log_error("Failed to set value to configuration file, invalid parameters\n"); + } + return ret_val; +} + +char* get_config_value_and_close(const char *conf_dir_name, + const char *conf_file_basename, + const char *section_name, + const char *key) { + struct uci_context *ctx; + struct uci_package *pkg; + int err_flg; + char *conf_fname_full; + int b_count; + FILE *fp; + char *ret_val; - 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; + ret_val = NULL; + pkg = NULL; + if ((conf_dir_name != NULL) && + (conf_file_basename != NULL) && + (section_name != NULL) && + (key != NULL)) { + b_count = strlen(conf_dir_name) + strlen(conf_file_basename) + 10; + conf_fname_full = (char *)calloc(1, b_count); + if (conf_fname_full != NULL) { + strncpy(conf_fname_full, conf_dir_name, b_count); + strncat(conf_fname_full, "/", 1); + strncat(conf_fname_full, conf_file_basename, strlen(conf_file_basename) + 1); + ctx = uci_alloc_context(); + if (ctx != NULL) { + if (access(conf_fname_full, R_OK) != 0) { + // if file is not writable, try to change it to be writable + if (access(conf_fname_full, R_OK) != 0) { + fp = fopen(conf_fname_full, "w+"); + fclose(fp); + } } + if (access(conf_fname_full, R_OK) == 0) { + uci_set_confdir(ctx, + conf_dir_name); + err_flg = uci_load(ctx, conf_fname_full, &pkg); + if ((err_flg == UCI_OK) && + (pkg != NULL)) { + ret_val = uci_get_config_value(ctx, + pkg, + section_name, + key); + // need to duplicate response val, as uci_free_context() would free the value otherwise + if (ret_val != NULL) + ret_val = strdup(ret_val); + } + else { + log_error("Failed to get value from configuration file: %s. Could not load current file content.\n", conf_fname_full); + } + } + else { + log_error("Failed to get value from configuration file: %s. File does not exist or is not readable.\n", conf_fname_full); + } + //TODO: uci_free_package(pkg) ?, or will uci_free_contect(ctx) also free the package + uci_free_context(ctx); } - 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; + free(conf_fname_full); } else { - log_error("Could not change config value, out of memory"); + log_error("Failed to get value from configuration file: %s/%s, out of memory.\n", conf_dir_name, conf_file_basename); } } else { - log_error("Could not change config value, invalid parameters"); + log_error("Failed to get value from configuration file, invalid parameters.\n"); } return ret_val; }