Make --loglevel and --S work.

diff --git a/adu.c b/adu.c
index 1aaea35900d67a89163d51625dee4425fc36354e..f8096fb8aade93fbbb4769df503c57efafc6cf3b 100644 (file)
--- a/adu.c
+++ b/adu.c
@@ -48,7 +48,7 @@ __printf_2_3 void __log(int ll, const char* fmt,...)
        time_t t1;
        char str[255] = "";
 
-       if (ll < 4)
+       if (ll < conf.loglevel_arg)
                return;
        outfd = stderr;
        time(&t1);
@@ -750,7 +750,7 @@ static void close_all_tables(void)
        free_hash_table();
 }
 
-static int com_create(char *dirname)
+static int com_create()
 {
        int ret = create_tables();
        if (ret < 0)
@@ -758,7 +758,7 @@ static int com_create(char *dirname)
        ret = open_dir_table();
        if (ret < 0)
                return ret;
-       ret = scan_dir(dirname);
+       ret = scan_dir(conf.base_dir_arg);
        if (ret < 0)
                goto out;
        ret = write_uid_list();
@@ -810,7 +810,7 @@ static int com_select(void)
 
 int main(int argc, char **argv)
 {
-       int ret = -E_SYNTAX;
+       int ret;
        struct cmdline_parser_params params = {
                .override = 0,
                .initialize = 1,
@@ -820,12 +820,11 @@ int main(int argc, char **argv)
        };
 
        cmdline_parser_ext(argc, argv, &conf, &params); /* aborts on errors */
-       if (argc > 2)
-               goto out;
-       if (argc == 1)
+       ret = -E_SYNTAX;
+       if (conf.select_given)
                ret = com_select();
        else
-               ret = com_create(argv[1]);
+               ret = com_create();
        if (ret < 0)
                goto out;
 out: