main: Read config file only if no jid parameter provided

nex created 6 years ago

Signed-off-by: nex <[e-mail]>

Change summary

src/main.c | 48 +++++++++++++++++++++++++-----------------------
1 file changed, 25 insertions(+), 23 deletions(-)

Detailed changes

src/main.c

@@ -413,30 +413,32 @@ int main(int argc, char *argv[]) {
     }
   }
 
-  // Loading config file
-  GKeyFile *config_file = g_key_file_new();
-  GError *error = NULL;
-  GString* configfile = g_string_new( g_get_home_dir());
-  g_string_append(configfile,"/.config/xmppc.conf");
-  gboolean configfilefound = g_key_file_load_from_file(
-    config_file,
-    configfile->str,
-    G_KEY_FILE_NONE,
-    &error);
-
-  if (!configfilefound) {
-   if(!g_error_matches(error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOUND)) {
-      logError(&xmppc, "Error loading key file: %s", error->message);
-      return -1;
-    }
-  } else {
-    if(jid == NULL && pwd == NULL) { 
-      logInfo(&xmppc,"Loading default account\n");
-      if( account == NULL ) {
-        account = "default";
+  // Loading config file if jid not provided by command line
+  if (jid == NULL) {
+    GKeyFile *config_file = g_key_file_new();
+    GError *error = NULL;
+    GString* configfile = g_string_new( g_get_home_dir());
+    g_string_append(configfile,"/.config/xmppc.conf");
+    gboolean configfilefound = g_key_file_load_from_file(
+      config_file,
+      configfile->str,
+      G_KEY_FILE_NONE,
+      &error);
+
+    if (!configfilefound) {
+      if(!g_error_matches(error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOUND)) {
+        logError(&xmppc, "Error loading key file: %s", error->message);
+        return -1;
+      }
+    } else {
+      if(jid == NULL && pwd == NULL) {
+        logInfo(&xmppc,"Loading default account\n");
+        if( account == NULL ) {
+          account = "default";
+        }
+        jid = g_key_file_get_value (config_file, account, "jid" ,&error);
+        pwd = g_key_file_get_value (config_file, account, "pwd" ,&error);
       }
-      jid = g_key_file_get_value (config_file, account, "jid" ,&error);
-      pwd = g_key_file_get_value (config_file, account, "pwd" ,&error);
     }
   }