X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fconfig.c;h=21396a522c8e0f91de4ade1972a2422ecb33b829;hb=9fa42f1a1d7d99895db93bdf811f2cb77accfc14;hp=2456097794064b1cb6a29b40137f5b0d76bbb47f;hpb=881cd13b40104b1ac8aebf282eca72e2fa134ba2;p=systembsd.git diff --git a/src/config.c b/src/config.c index 2456097..21396a5 100644 --- a/src/config.c +++ b/src/config.c @@ -17,31 +17,12 @@ #include #include #include +#include "config.h" static GKeyFile *config; static int config_descr; - static gchar *data_dir; -/*static int hostnamed_ispect_xml_descr, hostnamed_dbus_xml_descr; -static int localed_ispect_xml_descr, localed_dbus_xml_descr; -static int timedated_ispect_xml_descr, timedated_dbus_xml_descr; -static int logind_ispect_xml_descr, logind_dbus_xml_descr; - -/*TODO depending on builtin xml flag, these should be matched to checksums */ /* -static gchar **hostnamed_ispect_xml, hostnamed_dbus_xml; -static gchar **localed_ispect_xml, localed_dbus_xml; -static gchar **timedated_ispect_xml, timedated_dbus_xml; -static gchar **logind_ispect_xml, logind_dbus_xml; */ - -static void set_xml_descriptors(); - -static const gchar *CONFIG_KEYS[] = { - "PrettyHostname", - "IconName", - "ChassisType" -}; - /* NULL if key doesn't exist */ gchar *get_option(gchar *key, gchar *group) { @@ -60,7 +41,7 @@ gboolean set_option(gchar *key, gchar *value, gchar *group) { if(!g_key_file_get_string(config, group, key, NULL)) return FALSE; - //TODO safteycheck value + /* TODO safteycheck value */ g_key_file_set_string(config, group, key, value); return TRUE; } @@ -68,26 +49,29 @@ gboolean set_option(gchar *key, gchar *value, gchar *group) { /* initial load/check */ gboolean config_init() { + /* config is already set */ if(config) - return TRUE; //already init'd - + return TRUE; + config = g_key_file_new(); const gchar *config_path; GStatBuf *config_lstat; + int config_lstat_ret; config_path = "/etc/systemd_compat.conf"; + config_lstat_ret = g_lstat(config_path, config_lstat); - /* does conf exist? */ - if(g_lstat(config_path, config_lstat)) { + /* this should all be handled in the makefile + * does conf exist? + if(config_lstat_ret) { - /* if not, can we write it */ if(g_access("/etc/", W_OK)) { g_printf("%s\n", "no write permissions for /etc/! exiting.."); return FALSE; } - int config_descr; + int config_descr; config_descr = g_open(config_path, O_CREAT, 644); gchar *posix_hostname; @@ -98,7 +82,7 @@ gboolean config_init() { g_key_file_set_string(config, "hostnamed", "Hostname", posix_hostname); g_key_file_set_string(config, "hostnamed", "PrettyHostname", ""); g_key_file_set_string(config, "hostnamed", "IconName", "Computer"); - g_key_file_set_string(config, "hostnamed", "ChassisType", "laptop"); //TODO set these correctly + g_key_file_set_string(config, "hostnamed", "ChassisType","laptop"); if(!g_key_file_save_to_file(config, config_path, NULL)) { g_printf("failed to write config to %s!\n", config_path); @@ -110,102 +94,79 @@ gboolean config_init() { g_free(posix_hostname); - return TRUE; + return TRUE; - /* it does exist, read it */ - } else { + } else { */ - if(g_access(config_path, W_OK)) { - g_printf("%s\n", "no write permissions for /etc/! exiting.."); - return FALSE; - } else if(g_key_file_load_from_file(config, config_path, G_KEY_FILE_KEEP_COMMENTS, NULL)) - return TRUE; + if(g_access(config_path, W_OK)) { - g_printf("could not read config at %s! exiting..", config_path); + g_printf("%s\n", "no write permissions for /etc/! exiting.."); return FALSE; - } -} - -gboolean init_xml() { - - const gchar * const *data_dir_prefix; - data_dir_prefix = g_get_system_data_dirs(); - data_dir = g_strconcat(data_dir_prefix[0], "systemd_compat", NULL); - - GStatBuf *xml_lstat; - - /* does xml dir exist? */ - if(g_lstat(data_dir, xml_lstat)) { - - /* if not, can we write it? */ - if(g_access(data_dir_prefix[0], W_OK)) { - g_printf("no write permissions for %s! exiting...\n", data_dir_prefix[0]); - return FALSE; - } - - g_printf("creating xml data directory %s...\n", data_dir); - if(g_mkdir(data_dir, 644)) { - g_printf("failed to create dir %s...\n", data_dir); - return FALSE; - } + } else if(g_key_file_load_from_file(config, config_path, G_KEY_FILE_KEEP_COMMENTS, NULL)) + return TRUE; - set_xml_descriptors(); - } - return TRUE; /* kill me! */ -} /* kill me too!*/ + g_printf("could not read config at %s! exiting..", config_path); + return FALSE; +} +/* this definitely does not need to exist +gboolean init_xml() { -//LEFTOFF - -/* gchar *posix_hostname; - posix_hostname = g_malloc(255); + const gchar * const *data_dir_prefix; + int xml_lstat_ret; + GStatBuf *xml_lstat; - gethostname(posix_hostname, 255); + data_dir_prefix = g_get_system_data_dirs(); + data_dir = g_strconcat(data_dir_prefix[0], "systemd_compat", NULL); + + xml_lstat_ret = g_lstat(data_dir, xml_lstat); - g_key_file_set_string(config, "hostnamed", "Hostname", posix_hostname); - g_key_file_set_string(config, "hostnamed", "PrettyHostname", ""); - g_key_file_set_string(config, "hostnamed", "IconName", "Computer"); - g_key_file_set_string(config, "hostnamed", "ChassisType", "laptop"); //TODO set these correctly + if(xml_lstat_ret) { - if(!g_key_file_save_to_file(config, config_path, NULL)) { - g_printf("failed to write config to %s!\n", config_path); - g_free(posix_hostname); - return FALSE; - } + if(g_access(data_dir_prefix[0], W_OK)) { + g_printf("no write permissions for %s! exiting...\n", data_dir_prefix[0]); + return FALSE; + } - g_printf("wrote config to %s\n", config_path); + g_printf("creating xml data directory %s...\n", data_dir); - g_free(posix_hostname); + if(g_mkdir(data_dir, 644) || g_access) { + g_printf("failed to create dir %s...\n", data_dir); + return FALSE; + } - return TRUE; + if(!read_xml_from_installconf()) { + g_printf("failed to read xml configs in conf/...\n"); + return FALSE; + } - /* it does exist, read it */ /* - } else { + if(!populate_xml_data_dir()) { + g_printf("failed to write xml configs to %s...\n", data_dir); + return FALSE; + } - if(!g_access(config_path, W_OK)) { - g_printf("%s\n", "no write permissions for /etc/! exiting.."); - return FALSE; - } else if(g_key_file_load_from_file(config, config_path, G_KEY_FILE_KEEP_COMMENTS, NULL)) { - config_descr = g_open(config_path, O_RDWR, 644); - return TRUE; - } + if(!set_xml_descriptors()) { + g_printf("failed to fopen xml configs...\n"); + return FALSE; + } - g_printf("could not read config at %s! exiting..", config_path); - return FALSE; - } + return TRUE; + + } else { + if(!set_xml_descriptors()) { + g_printf("failed to fopen xml configs...\n"); + return FALSE; + } - return TRUE; + return TRUE; + } } */ -static void set_xml_descriptors() { - -} - void clean_config() { - //TODO g_ptr_array all of this - g_free(config); - g_free(data_dir); - g_close(config_descr, NULL); + /* TODO g_ptr_array all of this */ + g_free(config); + g_free(data_dir); + g_close(config_descr, NULL); }