clerie/xmppc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

main: Read config file only if no jid parameter provided

Browse Source 
Signed-off-by: nex <nex@nexadn.de>
This commit is contained in:
nex 2020-06-11 12:22:35 +02:00
parent ecb5697ddb
commit d1abb7ebc5
No known key found for this signature in database
GPG Key ID: C5C5C02315CEDF8F
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/main.c
View File

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