motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 12:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qapi: Turn generators' mandatory option -i into an argument

Browse source 
Mandatory option is silly, and the error handling is missing: the
programs crash when -i isn't supplied.  Make it an argument, and check
it properly.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2015-04-02 13:32:16 +02:00
parent b45409683e
commit 16d80f6181
4 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scripts/qapi.py
View file

@ -984,10 +984,9 @@ def parse_command_line(extra_options = "", extra_long_options = []):
try:
opts, args = getopt.gnu_getopt(sys.argv[1:],
"chp:i:o:" + extra_options,
"chp:o:" + extra_options,
["source", "header", "prefix=",
"input-file=", "output-dir="]
+ extra_long_options)
"output-dir="] + extra_long_options)
except getopt.GetoptError, err:
print >>sys.stderr, "%s: %s" % (sys.argv[0], str(err))
sys.exit(1)
@ -1002,8 +1001,6 @@ def parse_command_line(extra_options = "", extra_long_options = []):
o, a = oa
if o in ("-p", "--prefix"):
prefix = a
elif o in ("-i", "--input-file"):
input_file = a
elif o in ("-o", "--output-dir"):
output_dir = a + "/"
elif o in ("-c", "--source"):
@ -1017,8 +1014,9 @@ def parse_command_line(extra_options = "", extra_long_options = []):
do_c = True
do_h = True
if len(args) != 0:
print >>sys.stderr, "%s: too many arguments" % sys.argv[0]
if len(args) != 1:
print >>sys.stderr, "%s: need exactly one argument" % sys.argv[0]
sys.exit(1)
input_file = args[0]
return (input_file, output_dir, do_c, do_h, prefix, extra_opts)