From 50d1232ae4beb0262dd760aee212f28620fb139a Mon Sep 17 00:00:00 2001 From: Noel Maersk Date: Wed, 16 Apr 2014 17:35:32 +0300 Subject: [PATCH] config: add declarations to header, move globals there, too. --- configuration.c | 25 ++++++++++++++++++-- configuration.h | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/configuration.c b/configuration.c index 2a6ad27b..75ead8de 100644 --- a/configuration.c +++ b/configuration.c @@ -7,6 +7,8 @@ * your option) any later version. See COPYING for more details. */ +#include "configuration.h" + char *cnfbuf = NULL; static char *load_config(const char *arg, void __maybe_unused *unused) @@ -129,7 +131,27 @@ static char *set_default_config(const char *arg) return NULL; } -void default_save_file(char *filename); +void default_save_file(char *filename) +{ + if (default_config && *default_config) { + strcpy(filename, default_config); + return; + } + +#if defined(unix) || defined(__APPLE__) + if (getenv("HOME") && *getenv("HOME")) { + strcpy(filename, getenv("HOME")); + strcat(filename, "/"); + } + else + strcpy(filename, ""); + strcat(filename, ".sgminer/"); + mkdir(filename, 0777); +#else + strcpy(filename, ""); +#endif + strcat(filename, def_conf); +} static void load_default_config(void) { @@ -523,7 +545,6 @@ static char *set_devices(char *arg) return NULL; } -/* Used in configuration parsing (get pool being set up). */ static struct pool* get_current_pool() { while ((json_array_index + 1) > total_pools) diff --git a/configuration.h b/configuration.h index 0f3f8236..a3cd5a4e 100644 --- a/configuration.h +++ b/configuration.h @@ -1,6 +1,11 @@ #ifndef CONFIGURATION_H #define CONFIGURATION_H +#include "config.h" + +/* Configuration file buffer. */ +char *cnfbuf = NULL; + char *opt_api_allow = NULL; char *opt_api_groups; char *opt_api_description = PACKAGE_STRING; @@ -50,5 +55,63 @@ char *opt_socks_proxy = NULL; char *opt_kernel_path; +static char *load_config(const char *arg, void __maybe_unused *unused); +static char *parse_config(json_t *config, bool fileconf, int parent_iteration); + +static char *set_default_config(const char *arg); + +void default_save_file(char *filename); + +static void load_default_config(void); + +static char *set_algo(const char *arg); +static char *set_nfactor(const char *arg); + +static char *set_api_allow(const char *arg); +static char *set_api_groups(const char *arg); +static char *set_api_description(const char *arg); +static char *set_api_mcast_addr(const char *arg); +static char *set_api_mcast_addr(const char *arg); +static char *set_api_mcast_code(const char *arg); +static char *set_api_mcast_des(const char *arg); + +static char *set_null(const char __maybe_unused *arg); + +char *set_temp_cutoff(char *arg); + +static char* set_sharelog(char *arg); + +static char *set_schedtime(const char *arg, struct schedtime *st); +static char *set_balance(enum pool_strategy *strategy); +static char *set_loadbalance(enum pool_strategy *strategy); +static char *set_rotate(const char *arg, int *i); +static char *set_rr(enum pool_strategy *strategy); + +char *set_int_range(const char *arg, int *i, int min, int max); +void get_intrange(char *arg, int *val1, int *val2); +static char *set_int_0_to_9999(const char *arg, int *i); +static char *set_int_1_to_65535(const char *arg, int *i); +static char *set_int_0_to_10(const char *arg, int *i); +static char *set_int_1_to_10(const char *arg, int *i); + +static char *set_devices(char *arg); + +/* Used in configuration parsing (get pool being set up). */ +static struct pool* get_current_pool(); + +static char *set_pool_priority(char *arg); +static char *set_pool_description(char *arg); +static char *set_pool_state(char *arg); +static char *set_pool_name(char *arg); +static char *set_poolname_deprecated(char *arg); +static char *set_pool_algorithm(const char *arg); +static char *set_pool_nfactor(const char *arg); +static char *set_url(char *arg); +static char *set_user(const char *arg); +static char *set_pass(const char *arg); +static char *set_userpass(const char *arg); +static char *set_quota(char *arg); + +static char *enable_debug(bool *flag); #endif /* CONFIGURATION_H */