RepoMirrors/libabigail
1
0
Fork 0
mirror of git://sourceware.org/git/libabigail.git synced 2024-12-25 11:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better diagnostics when abipkgdiff has an extra argument

Browse Source 
When abipkgdiff is launched with three packages to compare rather than
just two, it gives a nonsensical error, just like if a wrong option was
given.  This patch fixes that.

	* tools/abipkgdiff.cc (options::wrong_arg): New data member.
	(parse_command_line): Set options::wrong_arg
	to the wrong argument passed.
	(main): Tell wrong argument case apart, and report it.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
This commit is contained in:
Dodji Seketeli 2016-05-28 00:00:33 +02:00
parent ef782b7536
commit 9086b015d1
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/abipkgdiff.cc
View File

@ -151,6 +151,7 @@ class options
public:
string wrong_option;
string wrong_arg;
string prog_name;
bool display_usage;
bool display_version;
@ -1806,7 +1807,10 @@ parse_command_line(int argc, char* argv[], options& opts)
else if (opts.package2.empty())
opts.package2 = abigail::tools_utils::make_path_absolute(argv[i]).get();
else
return false;
{
opts.wrong_arg = argv[i];
return false;
}
}
else if (!strcmp(argv[i], "--debug-info-pkg1")
|| !strcmp(argv[i], "--d1"))
@ -1926,9 +1930,14 @@ main(int argc, char* argv[])
vector<package_sptr> packages;
if (!parse_command_line(argc, argv, opts))
{
emit_prefix("abipkgdiff", cerr)
<< "unrecognized option:" << opts.wrong_option
<< "\ntry the --help option for more information\n";
if (!opts.wrong_option.empty())
emit_prefix("abipkgdiff", cerr)
<< "unrecognized option: " << opts.wrong_option
<< "\ntry the --help option for more information\n";
else
emit_prefix("abipkgdiff", cerr)
<< "unrecognized argument: " << opts.wrong_arg
<< "\ntry the --help option for more information\n";
return (abigail::tools_utils::ABIDIFF_USAGE_ERROR
| abigail::tools_utils::ABIDIFF_ERROR);
}