change buffer size for gethostname() to HOST_NAME_MAX to avoid accidently truncating...

[systembsd.git] / src / config.c

diff --git a/src/config.c b/src/config.c
index 3376fb8be90fcdb0cb2d85f4a58ac18906043602..ac9ecf468e2df72c62f6f4e2be478da8304b4491 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -21,91 +21,91 @@
 static GKeyFile *config;
 
 static const gchar *CONFIG_KEYS[] = {
-       "PrettyHostname",
-       "IconName",
-       "ChassisType"
+    "PrettyHostname",
+    "IconName",
+    "ChassisType"
 };
 
 /* NULL if key doesn't exist */
 gchar *get_option(gchar *key, gchar *group) {
 
-       if(!group)
-               group = "default";
+    if(!group)
+        group = "default";
 
-       return g_key_file_get_string(config, group, key, NULL);
+    return g_key_file_get_string(config, group, key, NULL);
 }
 
 /* false if key isn't already defined or value is invalid */
 gboolean set_option(gchar *key, gchar *value, gchar *group) {
 
-       if(!group)
-               group = "default";
+    if(!group)
+        group = "default";
 
-       if(!g_key_file_get_string(config, group, key, NULL))
-               return FALSE;
+    if(!g_key_file_get_string(config, group, key, NULL))
+        return FALSE;
 
-       //TODO safteycheck value
-       g_key_file_set_string(config, group, key, value);
-       return TRUE;
+    //TODO safteycheck value
+    g_key_file_set_string(config, group, key, value);
+    return TRUE;
 }
 
 /* initial load/check */
 gboolean config_init() {
 
-       if(config)
-               return TRUE; //already init'd
+    if(config)
+        return TRUE; //already init'd
 
-       config = g_key_file_new();
-       
-       const gchar *config_path;
-       GStatBuf *config_lstat;
+    config = g_key_file_new();
+    
+    const gchar *config_path;
+    GStatBuf *config_lstat;
 
-       config_path = "/etc/systemd_compat.conf";
+    config_path = "/etc/systemd_compat.conf";
 
-       /* does conf exist? */
-       if(g_lstat(config_path, config_lstat)) {
+    /* does conf exist? */
+    if(g_lstat(config_path, config_lstat)) {
 
-               /* if not, can we write it */
-               if(g_access("/etc/", W_OK)) {
-                       g_printf("%s\n", "no write permissions for /etc/! exiting..");
-                       return FALSE;
-               }
+        /* 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;
-               config_descr = g_open(config_path, O_CREAT, 644);
+        int config_descr;
+        config_descr = g_open(config_path, O_CREAT, 644);
 
-               gchar *posix_hostname;
-               posix_hostname = g_malloc(255); 
+        gchar *posix_hostname;
+        posix_hostname = g_malloc(HOST_NAME_MAX); 
 
-               gethostname(posix_hostname, 255);
+        gethostname(posix_hostname, HOST_NAME_MAX);
 
-               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", "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(!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;
+        }
 
-               g_printf("wrote config to %s\n", config_path);
+        g_printf("wrote config to %s\n", config_path);
 
-               g_free(posix_hostname);
+        g_free(posix_hostname);
 
-               return TRUE;
+        return TRUE;
 
-       /* it does exist, read it */
-       } else {
+    /* 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))
-                       return TRUE;
+        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;
 
-               g_printf("could not read config at %s! exiting..", config_path);
-               return FALSE;
-       }
+        g_printf("could not read config at %s! exiting..", config_path);
+        return FALSE;
+    }
 }