From 26949d961aa8ff3c8f7c3338955632e9f45ba20c Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Wed, 10 Oct 2012 21:30:54 +0200 Subject: [PATCH] kmscon: move config-handling to kmscon_conf.c Configuration handling is totally independent from kmscon_main.c so we move it into a separate file to avoid cluttering up kmscon_main.c. This also does some basic initialization in kmscon_conf.c which is solely related to configuration handling and logging. Signed-off-by: David Herrmann --- Makefile.am | 1 + src/kmscon_conf.c | 319 ++++++++++++++++++++++++++++++++++++++++++++++ src/kmscon_conf.h | 3 + src/kmscon_main.c | 299 +++---------------------------------------- 4 files changed, 341 insertions(+), 281 deletions(-) create mode 100644 src/kmscon_conf.c diff --git a/Makefile.am b/Makefile.am index 8a7b111..7f44cbc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -421,6 +421,7 @@ kmscon_SOURCES = \ src/kmscon_ui.h \ src/kmscon_ui.c \ src/kmscon_conf.h \ + src/kmscon_conf.c \ src/kmscon_main.c kmscon_CPPFLAGS = \ $(AM_CPPFLAGS) \ diff --git a/src/kmscon_conf.c b/src/kmscon_conf.c new file mode 100644 index 0000000..19672f5 --- /dev/null +++ b/src/kmscon_conf.c @@ -0,0 +1,319 @@ +/* + * kmscon - Configuration Parser + * + * Copyright (c) 2012 David Herrmann + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files + * (the "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "conf.h" +#include "kmscon_conf.h" +#include "log.h" +#include "shl_misc.h" + +struct kmscon_conf_t kmscon_conf; + +static void print_help() +{ + /* + * Usage/Help information + * This should be scaled to a maximum of 80 characters per line: + * + * 80 char line: + * | 10 | 20 | 30 | 40 | 50 | 60 | 70 | 80 | + * "12345678901234567890123456789012345678901234567890123456789012345678901234567890\n" + * 80 char line starting with tab: + * |10| 20 | 30 | 40 | 50 | 60 | 70 | 80 | + * "\t901234567890123456789012345678901234567890123456789012345678901234567890\n" + */ + fprintf(stderr, + "Usage:\n" + "\t%1$s [options]\n" + "\t%1$s -h [options]\n" + "\t%1$s -l [options] -- /bin/sh [sh-arguments]\n" + "\n" + "You can prefix boolean options with \"no-\" to negate it. If an argument is\n" + "given multiple times, only the last argument matters if not otherwise stated.\n" + "\n" + "General Options:\n" + "\t-h, --help [off] Print this help and exit\n" + "\t-v, --verbose [off] Print verbose messages\n" + "\t --debug [off] Enable debug mode\n" + "\t --silent [off] Suppress notices and warnings\n" + "\t-s, --switchvt [off] Automatically switch to VT\n" + "\t --vt [auto] Select which VT to run on on seat0\n" + "\t --seats [seat0] Select seats or pass 'all' to make\n" + "\t kmscon run on all seats\n" + "\n" + "Terminal Options:\n" + "\t-l, --login [/bin/sh]\n" + "\t Start the given login process instead\n" + "\t of the default process; all arguments\n" + "\t following '--' will be be parsed as\n" + "\t argv to this process. No more options\n" + "\t after '--' will be parsed so use it at\n" + "\t the end of the argument string\n" + "\t-t, --term [xterm-256color]\n" + "\t Value of the TERM environment variable\n" + "\t for the child process\n" + "\t --palette [default]\n" + "\t Select the used color palette\n" + "\t --sb-size [1000]\n" + "\t Size of the scrollback-buffer in lines\n" + "\n" + "Video Options:\n" + "\t --fbdev [off] Use fbdev instead of DRM\n" + "\t --dumb [off] Use dumb DRM instead of hardware-\n" + "\t accelerated DRM devices\n" + "\t --fps [50] Limit frame-rate\n" + "\t --render-engine [-] Console renderer\n" + "\t --render-timing [off] Print renderer timing information\n" + "\n" + "Input Device Options:\n" + "\t --xkb-layout [us] Set XkbLayout for input devices\n" + "\t --xkb-variant [-] Set XkbVariant for input devices\n" + "\t --xkb-options [-] Set XkbOptions for input devices\n" + "\t --xkb-repeat-delay [250]\n" + "\t Initial delay for key-repeat in ms\n" + "\t --xkb-repeat-rate [25]\n" + "\t Delay between two key-repeats in ms\n" + "\n" + "\t --grab-scroll-up [Up]\n" + "\t Shortcut to scroll up\n" + "\t --grab-scroll-down [Down]\n" + "\t Shortcut to scroll down\n" + "\t --grab-page-up [Prior]\n" + "\t Shortcut to scroll page up\n" + "\t --grab-page-down [Next]\n" + "\t Shortcut to scroll page down\n" + "\n" + "Font Options:\n" + "\t --font-engine [pango]\n" + "\t Font engine\n" + "\t --font-size [15]\n" + "\t Font size in points\n" + "\t --font-name [monospace]\n" + "\t Font name\n" + "\t --font-dpi [96]\n" + "\t Force DPI value for all fonts\n", + "kmscon"); + /* + * 80 char line: + * | 10 | 20 | 30 | 40 | 50 | 60 | 70 | 80 | + * "12345678901234567890123456789012345678901234567890123456789012345678901234567890\n" + * 80 char line starting with tab: + * |10| 20 | 30 | 40 | 50 | 60 | 70 | 80 | + * "\t901234567890123456789012345678901234567890123456789012345678901234567890\n" + */ +} + +static int conf_parse_vt(struct conf_option *opt, bool on, const char *arg) +{ + static const char prefix[] = "/dev/"; + unsigned int val; + char *str; + int ret; + + if (!shl_strtou(arg, &val)) { + ret = asprintf(&str, "%stty%u", prefix, val); + if (ret == -1) + return -ENOMEM; + } else if (*arg && *arg != '.' && *arg != '/') { + str = malloc(sizeof(prefix) + strlen(arg)); + if (!str) + return -ENOMEM; + + strcpy(str, prefix); + strcat(str, arg); + } else { + str = strdup(arg); + if (!str) + return -ENOMEM; + } + + opt->type->free(opt); + *(void**)opt->mem = str; + return 0; +} + +static void conf_default_vt(struct conf_option *opt) +{ + *(void**)opt->mem = opt->def; +} + +static const struct conf_type conf_vt = { + .flags = CONF_HAS_ARG, + .parse = conf_parse_vt, + .free = conf_free_value, + .set_default = conf_default_vt, +}; + +static int aftercheck_debug(struct conf_option *opt, int argc, char **argv, + int idx) +{ + /* --debug implies --verbose */ + if (kmscon_conf.debug) + kmscon_conf.verbose = 1; + + return 0; +} + +static int aftercheck_help(struct conf_option *opt, int argc, char **argv, + int idx) +{ + /* exit after printing --help information */ + if (kmscon_conf.help) { + print_help(); + kmscon_conf.exit = true; + } + + return 0; +} + +static char *def_argv[] = { NULL, "-i", NULL }; + +static int aftercheck_login(struct conf_option *opt, int argc, char **argv, + int idx) +{ + int ret; + + /* parse "--login [...] -- args" arguments */ + if (kmscon_conf.login) { + if (idx >= argc) { + fprintf(stderr, "Arguments for --login missing\n"); + return -EFAULT; + } + + kmscon_conf.argv = &argv[idx]; + ret = argc - idx; + } else { + def_argv[0] = getenv("SHELL") ? : _PATH_BSHELL; + kmscon_conf.argv = def_argv; + ret = 0; + } + + return ret; +} + +static int aftercheck_seats(struct conf_option *opt, int argc, char **argv, + int idx) +{ + if (kmscon_conf.seats[0] && + !kmscon_conf.seats[1] && + !strcmp(kmscon_conf.seats[0], "all")) + kmscon_conf.all_seats = true; + + return 0; +} + +static char *def_seats[] = { "seat0", NULL }; + +static struct conf_grab def_grab_scroll_up = { + .mods = SHL_SHIFT_MASK, + .keysym = XKB_KEY_Up, +}; + +static struct conf_grab def_grab_scroll_down = { + .mods = SHL_SHIFT_MASK, + .keysym = XKB_KEY_Down, +}; + +static struct conf_grab def_grab_page_up = { + .mods = SHL_SHIFT_MASK, + .keysym = XKB_KEY_Prior, +}; + +static struct conf_grab def_grab_page_down = { + .mods = SHL_SHIFT_MASK, + .keysym = XKB_KEY_Next, +}; + +struct conf_option options[] = { + CONF_OPTION_BOOL('h', "help", aftercheck_help, &kmscon_conf.help, false), + CONF_OPTION_BOOL('v', "verbose", NULL, &kmscon_conf.verbose, false), + CONF_OPTION_BOOL(0, "debug", aftercheck_debug, &kmscon_conf.debug, false), + CONF_OPTION_BOOL(0, "silent", NULL, &kmscon_conf.silent, false), + CONF_OPTION_BOOL(0, "fbdev", NULL, &kmscon_conf.use_fbdev, false), + CONF_OPTION_BOOL(0, "dumb", NULL, &kmscon_conf.dumb, false), + CONF_OPTION_UINT(0, "fps", NULL, &kmscon_conf.fps, 50), + CONF_OPTION_STRING(0, "render-engine", NULL, &kmscon_conf.render_engine, NULL), + CONF_OPTION_BOOL(0, "render-timing", NULL, &kmscon_conf.render_timing, false), + CONF_OPTION(0, 0, "vt", &conf_vt, NULL, &kmscon_conf.vt, NULL), + CONF_OPTION_BOOL('s', "switchvt", NULL, &kmscon_conf.switchvt, false), + CONF_OPTION_BOOL('l', "login", aftercheck_login, &kmscon_conf.login, false), + CONF_OPTION_STRING('t', "term", NULL, &kmscon_conf.term, "xterm-256color"), + CONF_OPTION_STRING(0, "palette", NULL, &kmscon_conf.palette, NULL), + CONF_OPTION_UINT(0, "sb-size", NULL, &kmscon_conf.sb_size, 1000), + CONF_OPTION_GRAB(0, "grab-scroll-up", NULL, &kmscon_conf.grab_scroll_up, &def_grab_scroll_up), + CONF_OPTION_GRAB(0, "grab-scroll-down", NULL, &kmscon_conf.grab_scroll_down, &def_grab_scroll_down), + CONF_OPTION_GRAB(0, "grab-page-up", NULL, &kmscon_conf.grab_page_up, &def_grab_page_up), + CONF_OPTION_GRAB(0, "grab-page-down", NULL, &kmscon_conf.grab_page_down, &def_grab_page_down), + CONF_OPTION_STRING(0, "xkb-layout", NULL, &kmscon_conf.xkb_layout, "us"), + CONF_OPTION_STRING(0, "xkb-variant", NULL, &kmscon_conf.xkb_variant, ""), + CONF_OPTION_STRING(0, "xkb-options", NULL, &kmscon_conf.xkb_options, ""), + CONF_OPTION_UINT(0, "xkb-repeat-delay", NULL, &kmscon_conf.xkb_repeat_delay, 250), + CONF_OPTION_UINT(0, "xkb-repeat-rate", NULL, &kmscon_conf.xkb_repeat_rate, 25), + CONF_OPTION_STRING(0, "font-engine", NULL, &kmscon_conf.font_engine, "pango"), + CONF_OPTION_UINT(0, "font-size", NULL, &kmscon_conf.font_size, 12), + CONF_OPTION_STRING(0, "font-name", NULL, &kmscon_conf.font_name, "monospace"), + CONF_OPTION_UINT(0, "font-dpi", NULL, &kmscon_conf.font_ppi, 96), + CONF_OPTION_STRING_LIST(0, "seats", aftercheck_seats, &kmscon_conf.seats, def_seats), +}; + +int kmscon_load_config(int argc, char **argv) +{ + size_t onum; + int ret; + + onum = sizeof(options) / sizeof(*options); + ret = conf_parse_argv(options, onum, argc, argv); + if (ret) + return ret; + + if (kmscon_conf.exit) + return 0; + + if (!kmscon_conf.debug && !kmscon_conf.verbose && kmscon_conf.silent) + log_set_config(&LOG_CONFIG_WARNING(0, 0, 0, 0)); + else + log_set_config(&LOG_CONFIG_INFO(kmscon_conf.debug, + kmscon_conf.verbose)); + + log_print_init("kmscon"); + + ret = conf_parse_all_files(options, onum); + if (ret) + return ret; + + return 0; +} + +void kmscon_free_config(void) +{ + conf_free(options, sizeof(options) / sizeof(*options)); +} diff --git a/src/kmscon_conf.h b/src/kmscon_conf.h index c609dbc..46afa9c 100644 --- a/src/kmscon_conf.h +++ b/src/kmscon_conf.h @@ -105,4 +105,7 @@ struct kmscon_conf_t { extern struct kmscon_conf_t kmscon_conf; +int kmscon_load_config(int argc, char **argv); +void kmscon_free_config(void); + #endif /* KMSCON_MAIN_H */ diff --git a/src/kmscon_main.c b/src/kmscon_main.c index 0210ff9..6ec9cfb 100644 --- a/src/kmscon_main.c +++ b/src/kmscon_main.c @@ -407,283 +407,21 @@ err_app: return ret; } -struct kmscon_conf_t kmscon_conf; - -static void print_help() -{ - /* - * Usage/Help information - * This should be scaled to a maximum of 80 characters per line: - * - * 80 char line: - * | 10 | 20 | 30 | 40 | 50 | 60 | 70 | 80 | - * "12345678901234567890123456789012345678901234567890123456789012345678901234567890\n" - * 80 char line starting with tab: - * |10| 20 | 30 | 40 | 50 | 60 | 70 | 80 | - * "\t901234567890123456789012345678901234567890123456789012345678901234567890\n" - */ - fprintf(stderr, - "Usage:\n" - "\t%1$s [options]\n" - "\t%1$s -h [options]\n" - "\t%1$s -l [options] -- /bin/sh [sh-arguments]\n" - "\n" - "You can prefix boolean options with \"no-\" to negate it. If an argument is\n" - "given multiple times, only the last argument matters if not otherwise stated.\n" - "\n" - "General Options:\n" - "\t-h, --help [off] Print this help and exit\n" - "\t-v, --verbose [off] Print verbose messages\n" - "\t --debug [off] Enable debug mode\n" - "\t --silent [off] Suppress notices and warnings\n" - "\t-s, --switchvt [off] Automatically switch to VT\n" - "\t --vt [auto] Select which VT to run on on seat0\n" - "\t --seats [seat0] Select seats or pass 'all' to make\n" - "\t kmscon run on all seats\n" - "\n" - "Terminal Options:\n" - "\t-l, --login [/bin/sh]\n" - "\t Start the given login process instead\n" - "\t of the default process; all arguments\n" - "\t following '--' will be be parsed as\n" - "\t argv to this process. No more options\n" - "\t after '--' will be parsed so use it at\n" - "\t the end of the argument string\n" - "\t-t, --term [xterm-256color]\n" - "\t Value of the TERM environment variable\n" - "\t for the child process\n" - "\t --palette [default]\n" - "\t Select the used color palette\n" - "\t --sb-size [1000]\n" - "\t Size of the scrollback-buffer in lines\n" - "\n" - "Video Options:\n" - "\t --fbdev [off] Use fbdev instead of DRM\n" - "\t --dumb [off] Use dumb DRM instead of hardware-\n" - "\t accelerated DRM devices\n" - "\t --fps [50] Limit frame-rate\n" - "\t --render-engine [-] Console renderer\n" - "\t --render-timing [off] Print renderer timing information\n" - "\n" - "Input Device Options:\n" - "\t --xkb-layout [us] Set XkbLayout for input devices\n" - "\t --xkb-variant [-] Set XkbVariant for input devices\n" - "\t --xkb-options [-] Set XkbOptions for input devices\n" - "\t --xkb-repeat-delay [250]\n" - "\t Initial delay for key-repeat in ms\n" - "\t --xkb-repeat-rate [25]\n" - "\t Delay between two key-repeats in ms\n" - "\n" - "\t --grab-scroll-up [Up]\n" - "\t Shortcut to scroll up\n" - "\t --grab-scroll-down [Down]\n" - "\t Shortcut to scroll down\n" - "\t --grab-page-up [Prior]\n" - "\t Shortcut to scroll page up\n" - "\t --grab-page-down [Next]\n" - "\t Shortcut to scroll page down\n" - "\n" - "Font Options:\n" - "\t --font-engine [pango]\n" - "\t Font engine\n" - "\t --font-size [15]\n" - "\t Font size in points\n" - "\t --font-name [monospace]\n" - "\t Font name\n" - "\t --font-dpi [96]\n" - "\t Force DPI value for all fonts\n", - "kmscon"); - /* - * 80 char line: - * | 10 | 20 | 30 | 40 | 50 | 60 | 70 | 80 | - * "12345678901234567890123456789012345678901234567890123456789012345678901234567890\n" - * 80 char line starting with tab: - * |10| 20 | 30 | 40 | 50 | 60 | 70 | 80 | - * "\t901234567890123456789012345678901234567890123456789012345678901234567890\n" - */ -} - -int conf_parse_vt(struct conf_option *opt, bool on, const char *arg) -{ - static const char prefix[] = "/dev/"; - unsigned int val; - char *str; - int ret; - - if (!shl_strtou(arg, &val)) { - ret = asprintf(&str, "%stty%u", prefix, val); - if (ret == -1) - return -ENOMEM; - } else if (*arg && *arg != '.' && *arg != '/') { - str = malloc(sizeof(prefix) + strlen(arg)); - if (!str) - return -ENOMEM; - - strcpy(str, prefix); - strcat(str, arg); - } else { - str = strdup(arg); - if (!str) - return -ENOMEM; - } - - - opt->type->free(opt); - *(void**)opt->mem = str; - return 0; -} - -void conf_default_vt(struct conf_option *opt) -{ - *(void**)opt->mem = opt->def; -} - -const struct conf_type conf_vt = { - .flags = CONF_HAS_ARG, - .parse = conf_parse_vt, - .free = conf_free_value, - .set_default = conf_default_vt, -}; - -static int aftercheck_debug(struct conf_option *opt, int argc, char **argv, - int idx) -{ - /* --debug implies --verbose */ - if (kmscon_conf.debug) - kmscon_conf.verbose = 1; - - return 0; -} - -static int aftercheck_help(struct conf_option *opt, int argc, char **argv, - int idx) -{ - /* exit after printing --help information */ - if (kmscon_conf.help) { - print_help(); - kmscon_conf.exit = true; - } - - return 0; -} - -static char *def_argv[] = { NULL, "-i", NULL }; - -static int aftercheck_login(struct conf_option *opt, int argc, char **argv, - int idx) -{ - int ret; - - /* parse "--login [...] -- args" arguments */ - if (kmscon_conf.login) { - if (idx >= argc) { - fprintf(stderr, "Arguments for --login missing\n"); - return -EFAULT; - } - - kmscon_conf.argv = &argv[idx]; - ret = argc - idx; - } else { - def_argv[0] = getenv("SHELL") ? : _PATH_BSHELL; - kmscon_conf.argv = def_argv; - ret = 0; - } - - return ret; -} - -static int aftercheck_seats(struct conf_option *opt, int argc, char **argv, - int idx) -{ - if (kmscon_conf.seats[0] && - !kmscon_conf.seats[1] && - !strcmp(kmscon_conf.seats[0], "all")) - kmscon_conf.all_seats = true; - - return 0; -} - -static char *def_seats[] = { "seat0", NULL }; - -static struct conf_grab def_grab_scroll_up = { - .mods = SHL_SHIFT_MASK, - .keysym = XKB_KEY_Up, -}; - -static struct conf_grab def_grab_scroll_down = { - .mods = SHL_SHIFT_MASK, - .keysym = XKB_KEY_Down, -}; - -static struct conf_grab def_grab_page_up = { - .mods = SHL_SHIFT_MASK, - .keysym = XKB_KEY_Prior, -}; - -static struct conf_grab def_grab_page_down = { - .mods = SHL_SHIFT_MASK, - .keysym = XKB_KEY_Next, -}; - -struct conf_option options[] = { - CONF_OPTION_BOOL('h', "help", aftercheck_help, &kmscon_conf.help, false), - CONF_OPTION_BOOL('v', "verbose", NULL, &kmscon_conf.verbose, false), - CONF_OPTION_BOOL(0, "debug", aftercheck_debug, &kmscon_conf.debug, false), - CONF_OPTION_BOOL(0, "silent", NULL, &kmscon_conf.silent, false), - CONF_OPTION_BOOL(0, "fbdev", NULL, &kmscon_conf.use_fbdev, false), - CONF_OPTION_BOOL(0, "dumb", NULL, &kmscon_conf.dumb, false), - CONF_OPTION_UINT(0, "fps", NULL, &kmscon_conf.fps, 50), - CONF_OPTION_STRING(0, "render-engine", NULL, &kmscon_conf.render_engine, NULL), - CONF_OPTION_BOOL(0, "render-timing", NULL, &kmscon_conf.render_timing, false), - CONF_OPTION(0, 0, "vt", &conf_vt, NULL, &kmscon_conf.vt, NULL), - CONF_OPTION_BOOL('s', "switchvt", NULL, &kmscon_conf.switchvt, false), - CONF_OPTION_BOOL('l', "login", aftercheck_login, &kmscon_conf.login, false), - CONF_OPTION_STRING('t', "term", NULL, &kmscon_conf.term, "xterm-256color"), - CONF_OPTION_STRING(0, "palette", NULL, &kmscon_conf.palette, NULL), - CONF_OPTION_UINT(0, "sb-size", NULL, &kmscon_conf.sb_size, 1000), - CONF_OPTION_GRAB(0, "grab-scroll-up", NULL, &kmscon_conf.grab_scroll_up, &def_grab_scroll_up), - CONF_OPTION_GRAB(0, "grab-scroll-down", NULL, &kmscon_conf.grab_scroll_down, &def_grab_scroll_down), - CONF_OPTION_GRAB(0, "grab-page-up", NULL, &kmscon_conf.grab_page_up, &def_grab_page_up), - CONF_OPTION_GRAB(0, "grab-page-down", NULL, &kmscon_conf.grab_page_down, &def_grab_page_down), - CONF_OPTION_STRING(0, "xkb-layout", NULL, &kmscon_conf.xkb_layout, "us"), - CONF_OPTION_STRING(0, "xkb-variant", NULL, &kmscon_conf.xkb_variant, ""), - CONF_OPTION_STRING(0, "xkb-options", NULL, &kmscon_conf.xkb_options, ""), - CONF_OPTION_UINT(0, "xkb-repeat-delay", NULL, &kmscon_conf.xkb_repeat_delay, 250), - CONF_OPTION_UINT(0, "xkb-repeat-rate", NULL, &kmscon_conf.xkb_repeat_rate, 25), - CONF_OPTION_STRING(0, "font-engine", NULL, &kmscon_conf.font_engine, "pango"), - CONF_OPTION_UINT(0, "font-size", NULL, &kmscon_conf.font_size, 12), - CONF_OPTION_STRING(0, "font-name", NULL, &kmscon_conf.font_name, "monospace"), - CONF_OPTION_UINT(0, "font-dpi", NULL, &kmscon_conf.font_ppi, 96), - CONF_OPTION_STRING_LIST(0, "seats", aftercheck_seats, &kmscon_conf.seats, def_seats), -}; - int main(int argc, char **argv) { int ret; struct kmscon_app app; - size_t onum; - onum = sizeof(options) / sizeof(*options); - ret = conf_parse_argv(options, onum, argc, argv); - if (ret) + ret = kmscon_load_config(argc, argv); + if (ret) { + log_error("cannot parse configuration: %d", ret); goto err_out; - - if (kmscon_conf.exit) { - conf_free(options, onum); - return EXIT_SUCCESS; } - if (!kmscon_conf.debug && !kmscon_conf.verbose && kmscon_conf.silent) - log_set_config(&LOG_CONFIG_WARNING(0, 0, 0, 0)); - else - log_set_config(&LOG_CONFIG_INFO(kmscon_conf.debug, - kmscon_conf.verbose)); - - log_print_init("kmscon"); - - ret = conf_parse_all_files(options, onum); - if (ret) - goto err_out; + if (kmscon_conf.exit) { + kmscon_free_config(); + return 0; + } kmscon_font_load_all(); kmscon_text_load_all(); @@ -694,7 +432,7 @@ int main(int argc, char **argv) goto err_unload; if (kmscon_conf.switchvt) { - log_debug("activating VTs during startup due to user request"); + log_debug("activating VTs during startup"); uterm_vt_master_activate_all(app.vtm); } @@ -710,8 +448,8 @@ int main(int argc, char **argv) * We use a timeout of 100ms to avoid haning on exit. * We could also wait on app.eloop but this would allow other * subsystems to continue receiving events and this is not what - * we want. - */ + * we want. */ + log_debug("deactivating VTs during shutdown"); ret = uterm_vt_master_deactivate_all(app.vtm); if (ret > 0) { log_debug("waiting for %d VTs to deactivate", ret); @@ -720,19 +458,18 @@ int main(int argc, char **argv) } } + ret = 0; + destroy_app(&app); - kmscon_text_unload_all(); - kmscon_font_unload_all(); - conf_free(options, onum); - log_info("exiting"); - - return EXIT_SUCCESS; - err_unload: kmscon_text_unload_all(); kmscon_font_unload_all(); err_out: - conf_free(options, onum); - log_err("cannot initialize kmscon, errno %d: %s", ret, strerror(-ret)); + kmscon_free_config(); + + if (ret) + log_err("cannot initialize kmscon, errno %d: %s", + ret, strerror(-ret)); + log_info("exiting"); return -ret; }