From 374c102073bf8712dc5433f778ca39f85bb97f9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Date: Wed, 20 Feb 2019 02:33:29 +0100 Subject: cam: Improve when usage information is printed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Running the cam tool without any options results in the tool to exit with EXIT_FAILURE but no usage being printed, this is confusing. Improve this by also printing the usage text. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- src/cam/main.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/cam/main.cpp b/src/cam/main.cpp index ddb416f6..4c2df583 100644 --- a/src/cam/main.cpp +++ b/src/cam/main.cpp @@ -67,12 +67,9 @@ static int parseOptions(int argc, char *argv[]) parser.addOption(OptList, OptionNone, "List all cameras", "list"); options = parser.parse(argc, argv); - if (!options.valid()) - return -EINVAL; - - if (argc == 1 || options.isSet(OptHelp)) { + if (!options.valid() || options.isSet(OptHelp)) { parser.usage(); - return 1; + return !options.valid() ? -EINVAL : -EINTR; } return 0; @@ -204,7 +201,7 @@ int main(int argc, char **argv) ret = parseOptions(argc, argv); if (ret < 0) - return EXIT_FAILURE; + return ret == -EINTR ? 0 : EXIT_FAILURE; CameraManager *cm = CameraManager::instance(); -- cgit v1.2.1