diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2012-08-02 13:45:54 +0100 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-02 13:16:42 -0500 |
commit | c8057f951d64de93bfd01569c0a725baa9f94372 (patch) | |
tree | a923a40f0857c4de2e8feddbdadc4a2cc6d6bb59 /arch_init.c | |
parent | 02d2bd5d57812154cfb978bc2098cf49d551583d (diff) | |
download | hqemu-c8057f951d64de93bfd01569c0a725baa9f94372.zip hqemu-c8057f951d64de93bfd01569c0a725baa9f94372.tar.gz |
Support 'help' as a synonym for '?' in command line options
For command line options which permit '?' meaning 'please list the
permitted values', add support for 'help' as a synonym, by abstracting
the check out into a helper function.
This change means that in some cases where we were being lazy in
our string parsing, "?junk" will now be rejected as an invalid option
rather than being (undocumentedly) treated the same way as "?".
Update the documentation to use 'help' rather than '?', since '?'
is a shell metacharacter and thus prone to fail confusingly if there
is a single character filename in the current working directory and
the '?' has not been escaped. It's therefore better to steer users
towards 'help', though '?' is retained for backwards compatibility.
We do not, however, update the output of the system emulator's -help
(or any documentation autogenerated from the qemu-options.hx which
is the source of the -help text) because libvirt parses our -help
output and will break. At a later date when QEMU provides a better
interface so libvirt can avoid having to do this, we can update the
-help text too.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'arch_init.c')
-rw-r--r-- | arch_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch_init.c b/arch_init.c index 26f30ef..60823ba 100644 --- a/arch_init.c +++ b/arch_init.c @@ -680,7 +680,7 @@ void select_soundhw(const char *optarg) { struct soundhw *c; - if (*optarg == '?') { + if (is_help_option(optarg)) { show_valid_cards: printf("Valid sound card names (comma separated):\n"); @@ -688,7 +688,7 @@ void select_soundhw(const char *optarg) printf ("%-11s %s\n", c->name, c->descr); } printf("\n-soundhw all will enable all of the above\n"); - exit(*optarg != '?'); + exit(!is_help_option(optarg)); } else { size_t l; |