[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 1/4] keyval: Parse help options
From: |
Eric Blake |
Subject: |
Re: [PATCH 1/4] keyval: Parse help options |
Date: |
Tue, 29 Sep 2020 12:46:55 -0500 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 |
On 9/29/20 12:26 PM, Kevin Wolf wrote:
> This adds a new parameter 'help' to keyval_parse() that enables parsing
> of help options. If NULL is passed, the function behaves the same as
> before. But if a bool pointer is given, it contains the information
> whether an option "help" without value was given (which would otherwise
> either result in an error or be interpreted as the value for an implied
> key).
>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
> +++ b/util/keyval.c
Might be nice to see this before the testsuite changes by tweaking the
git orderfile.
> @@ -166,7 +166,7 @@ static QObject *keyval_parse_put(QDict *cur,
> * On failure, return NULL.
> */
> static const char *keyval_parse_one(QDict *qdict, const char *params,
> - const char *implied_key,
> + const char *implied_key, bool *help,
> Error **errp)
> {
> const char *key, *key_end, *s, *end;
> @@ -179,6 +179,16 @@ static const char *keyval_parse_one(QDict *qdict, const
> char *params,
>
> key = params;
> len = strcspn(params, "=,");
> +
> + if (help && key[len] != '=' && !strncmp(key, "help", len)) {
What if the user typed "help,," to get "help," as the value of the
implied key?
> + *help = true;
> + s = key + len;
> + if (key[len] != '\0') {
> + s++;
> + }
> + return s;
> + }
> +
> if (implied_key && len && key[len] != '=') {
> /* Desugar implied key */
> key = implied_key;
> @@ -388,21 +398,33 @@ static QObject *keyval_listify(QDict *cur, GSList
> *key_of_cur, Error **errp)
>
> /*
> * Parse @params in QEMU's traditional KEY=VALUE,... syntax.
> + *
> * If @implied_key, the first KEY= can be omitted. @implied_key is
> * implied then, and VALUE can't be empty or contain ',' or '='.
> + *
> + * If @help is given, an option "help" without a value isn't added to
> + * the resulting dictionary, but instead sets @help to true. If no
> + * help option is found, @help is false on return. All other options
> + * are parsed and returned normally so that context specific help can
> + * be printed.
> + *
> * On success, return a dictionary of the parsed keys and values.
> * On failure, store an error through @errp and return NULL.
> */
> QDict *keyval_parse(const char *params, const char *implied_key,
> - Error **errp)
> + bool *help, Error **errp)
> {
> QDict *qdict = qdict_new();
> QObject *listified;
> const char *s;
>
> + if (help) {
> + *help = false;
> + }
> +
> s = params;
> while (*s) {
> - s = keyval_parse_one(qdict, s, implied_key, errp);
> + s = keyval_parse_one(qdict, s, implied_key, help, errp);
> if (!s) {
> qobject_unref(qdict);
> return NULL;
>
I like it, but wonder if you are missing one corner case.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
[PATCH 4/4] qemu-storage-daemon: Remove QemuOpts from --object parser, Kevin Wolf, 2020/09/29