aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkremlin <ian@kremlin.cc>2014-06-20 13:26:47 +0800
committerkremlin <ian@kremlin.cc>2014-06-20 13:26:47 +0800
commit5b435dd108feb27c4d14f71661b377a171969ea7 (patch)
tree64255ba4eed5e1cbcfd454356e1abab97b2460f1
parentd099276b7aa757106ca39df9dfdd208a71c984c9 (diff)
downloadsystembsd-5b435dd108feb27c4d14f71661b377a171969ea7.tar
systembsd-5b435dd108feb27c4d14f71661b377a171969ea7.tar.gz
systembsd-5b435dd108feb27c4d14f71661b377a171969ea7.tar.bz2
systembsd-5b435dd108feb27c4d14f71661b377a171969ea7.tar.lz
systembsd-5b435dd108feb27c4d14f71661b377a171969ea7.tar.xz
systembsd-5b435dd108feb27c4d14f71661b377a171969ea7.tar.zst
systembsd-5b435dd108feb27c4d14f71661b377a171969ea7.zip
goodnight
-rw-r--r--TODO1
-rw-r--r--src/config.c95
-rw-r--r--src/main.c14
3 files changed, 102 insertions, 8 deletions
diff --git a/TODO b/TODO
index 1f986f4..8463eba 100644
--- a/TODO
+++ b/TODO
@@ -1 +1,2 @@
* get autoconf stuff figured out
+ * handle SIGINTs so file descriptors are dropped properly, otherwise we get bus errors next run
diff --git a/src/config.c b/src/config.c
index 2b5ec06..f76b420 100644
--- a/src/config.c
+++ b/src/config.c
@@ -5,6 +5,19 @@
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 const gchar *CONFIG_KEYS[] = {
"PrettyHostname",
"IconName",
@@ -50,7 +63,7 @@ gboolean config_init() {
/* does conf exist? */
if(g_lstat(config_path, config_lstat)) {
- /* if not, can we write it */
+ /* if not, can we write it? */
if(g_access("/etc/", W_OK)) {
g_printf("%s\n", "no write permissions for /etc/! exiting..");
return FALSE;
@@ -96,12 +109,82 @@ gboolean config_init() {
}
}
-void clean_config() {
+gboolean init_xml() {
- if(config)
- g_free(config);
+ gchar **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;
+ }
+
+ set_xml_descriptors();
+//LEFTOFF
+
+ gchar *posix_hostname;
+ posix_hostname = g_malloc(255);
+
+ gethostname(posix_hostname, 255);
+
+ 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(!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(config_descr)
- g_close(config_descr, NULL);
+ g_printf("wrote config to %s\n", config_path);
+
+ g_free(posix_hostname);
+
+ return TRUE;
+
+ /* it does exist, read it */
+ } 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)) {
+ config_descr = g_open(config_path, O_RDWR, 644);
+ return TRUE;
+ }
+
+ g_printf("could not read config at %s! exiting..", config_path);
+ return FALSE;
+ }
+
+
+ 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);
}
diff --git a/src/main.c b/src/main.c
index 82d68f8..3e80e28 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,8 +14,18 @@
gboolean systemd_utils_init() {
#ifdef INSTALL
if(!config_init()) {
- g_printf("%s\n", "FAILED to install configs in /etc/!");
- return FALSE;
+ gchar *tmp;
+ tmp = "/etc/"; //what the hell is /etc/xdg anyway
+
+ g_printf("FAILED to install configs in %s!\n", tmp);
+ return FALSE;
+ }
+ if(!init_xml()) {
+ gchar **tmp;
+ tmp = g_get_system_data_dirs();
+
+ g_printf("FAILED to install xml configs in %s!\n", tmp[0]);
+ return FALSE;
}
#endif
return TRUE;