merge license, hostname buffer changes from master branch

[systembsd.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 3e80e28e989d91de16cd8470ab6ce746fff16b3d..fc50a2445cdd8bc547163381d62f59c52ea7f6ab 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2014 Ian Sutton <ian@kremlin.cc>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
 /* debugging */
 #define INSTALL 1
 //#define NO_BUILTIN_XML 1
@@ -12,6 +28,7 @@
 //#include "main/h"
 
 gboolean systemd_utils_init() {
+<<<<<<< HEAD
        #ifdef INSTALL
                if(!config_init()) {
                        gchar *tmp;
@@ -29,23 +46,32 @@ gboolean systemd_utils_init() {
                }
        #endif
        return TRUE;
+=======
+    #ifdef INSTALL
+        if(!config_init()) {
+            g_printf("%s\n", "FAILED to install configs in /etc/!");
+            return FALSE; 
+        }
+    #endif
+    return TRUE;
+>>>>>>> master
 }
 
 int main() {
 
-       GMainLoop *mloop;
-       
-       if(!systemd_utils_init()) {
-               g_printf("failed to init, are you root?\n");
-               return 1; //TODO errno properly. grep for all "return 1;"s, not TODO'ing each one
-       }
+    GMainLoop *mloop;
+    
+    if(!systemd_utils_init()) {
+        g_printf("failed to init, are you root?\n");
+        return 1; //TODO errno properly. grep for all "return 1;"s, not TODO'ing each one
+    }
 
-       hostnamed_init();
+    hostnamed_init();
 
-       mloop = g_main_loop_new(NULL, TRUE);
+    mloop = g_main_loop_new(NULL, TRUE);
 
-       g_main_loop_run(mloop);
-       g_main_loop_unref(mloop);
+    g_main_loop_run(mloop);
+    g_main_loop_unref(mloop);
 
-       return 0;
+    return 0;
 }