From 47bbdc72967faf1cca2ca8b8bbeefab4fee67d95 Mon Sep 17 00:00:00 2001 From: Lyude Paul Date: Mon, 8 May 2017 12:47:55 -0400 Subject: [PATCH] weston: Add support for "--foo bar" style options A little earlier today I ended up spending a lot of time trying to figure out why weston wasn't managing to launch over SSH and telling me that I did not have a --tty option specified, despite me passing the option strings ["--tty", "3"]. Turns out weston just doesn't support that. So, add support for this kind of format in addition to "--foo=bar" to save others from making the same mistake I did. Changes since v1: - Add comment about unreachable boolean check in long_option_with_arg() - Convert boolean check in long_option_with_arg() to assert Signed-off-by: Lyude Reviewed-by: Eric Engestrom Reviewed-by: Quentin Glidic --- shared/option-parser.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/shared/option-parser.c b/shared/option-parser.c index eee75468..e8d9b3b7 100644 --- a/shared/option-parser.c +++ b/shared/option-parser.c @@ -86,6 +86,31 @@ long_option(const struct weston_option *options, int count, char *arg) return 0; } +static int +long_option_with_arg(const struct weston_option *options, int count, char *arg, + char *param) +{ + int k, len; + + for (k = 0; k < count; k++) { + if (!options[k].name) + continue; + + len = strlen(options[k].name); + if (strncmp(options[k].name, arg + 2, len) != 0) + continue; + + /* Since long_option() should handle all booleans, we should + * never reach this + */ + assert(options[k].type != WESTON_OPTION_BOOLEAN); + + return handle_option(options + k, param); + } + + return 0; +} + static int short_option(const struct weston_option *options, int count, char *arg) { @@ -148,6 +173,13 @@ parse_options(const struct weston_option *options, if (long_option(options, count, argv[i])) continue; + /* ...also handle --foo bar */ + if (i + 1 < *argc && + long_option_with_arg(options, count, + argv[i], argv[i+1])) { + i++; + continue; + } } else { /* Short option, e.g -f or -f42 */ if (short_option(options, count, argv[i]))