X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=a7eee85d3cc0d5cf94073ca39c6223a7c4a639d4;hp=b28e8951ce10ce791db094e186fd18e8a1a2ae09;hb=7e611b37e41f0ec7ec6d3173b7e88ed5b9b3a276;hpb=e2167286448ce2ed9a01a548e7e9832563035088 diff --git a/client_common.c b/client_common.c index b28e8951..a7eee85d 100644 --- a/client_common.c +++ b/client_common.c @@ -15,6 +15,7 @@ #include "para.h" #include "error.h" #include "list.h" +#include "lsu.h" #include "sched.h" #include "crypt.h" #include "net.h" @@ -525,12 +526,10 @@ int client_parse_config(int argc, char *argv[], struct client_task **ct_ptr, int *loglevel) { const struct lls_command *cmd = CLIENT_CMD_PTR; - void *map; - size_t sz; struct lls_parse_result *lpr; int ret, ll; struct client_task *ct; - char *cf = NULL, *kf = NULL, *user, *errctx, *home = para_homedir(); + char *kf = NULL, *user, *errctx, *home = para_homedir(); ret = lls(lls_parse(argc, argv, cmd, &lpr, &errctx)); if (ret < 0) @@ -538,38 +537,10 @@ int client_parse_config(int argc, char *argv[], struct client_task **ct_ptr, version_handle_flag("client", CLIENT_OPT_GIVEN(VERSION, lpr)); handle_help_flag(lpr); - if (CLIENT_OPT_GIVEN(CONFIG_FILE, lpr)) - cf = para_strdup(CLIENT_OPT_STRING_VAL(CONFIG_FILE, lpr)); - else - cf = make_message("%s/.paraslash/client.conf", home); - ret = mmap_full_file(cf, O_RDONLY, &map, &sz, NULL); - if (ret < 0) { - if (ret != -E_EMPTY && ret != -ERRNO_TO_PARA_ERROR(ENOENT)) - goto out; - if (ret == -ERRNO_TO_PARA_ERROR(ENOENT) && - CLIENT_OPT_GIVEN(CONFIG_FILE, lpr)) - goto out; - } else { - int cf_argc; - char **cf_argv; - struct lls_parse_result *cf_lpr, *merged_lpr; - ret = lls(lls_convert_config(map, sz, NULL, &cf_argv, &errctx)); - para_munmap(map, sz); - if (ret < 0) - goto out; - cf_argc = ret; - ret = lls(lls_parse(cf_argc, cf_argv, cmd, &cf_lpr, &errctx)); - lls_free_argv(cf_argv); - if (ret < 0) - goto out; - ret = lls(lls_merge(lpr, cf_lpr, cmd, &merged_lpr, - &errctx)); - lls_free_parse_result(cf_lpr, cmd); - if (ret < 0) - goto out; - lls_free_parse_result(lpr, cmd); - lpr = merged_lpr; - } + ret = lsu_merge_config_file_options(CLIENT_OPT_STRING_VAL(CONFIG_FILE, lpr), + "client.conf", &lpr, cmd, client_suite, 0U /* default flags */); + if (ret < 0) + goto out; /* success */ ll = CLIENT_OPT_UINT32_VAL(LOGLEVEL, lpr); if (loglevel) @@ -587,7 +558,6 @@ int client_parse_config(int argc, char *argv[], struct client_task **ct_ptr, } } PARA_INFO_LOG("user: %s\n", user); - PARA_INFO_LOG("config file: %s\n", cf); PARA_INFO_LOG("key file: %s\n", kf); PARA_INFO_LOG("loglevel: %d\n", ll); ct = para_calloc(sizeof(*ct)); @@ -599,7 +569,6 @@ int client_parse_config(int argc, char *argv[], struct client_task **ct_ptr, ret = lls_num_inputs(lpr); out: free(home); - free(cf); if (ret < 0) { if (errctx) PARA_ERROR_LOG("%s\n", errctx);