[PATCH] objtool: Print top level commands on incorrect usage

[PATCH] objtool: Print top level commands on incorrect usage

[Kamalesh Babulal]

Maintain the consistency with objtool subcommands, by
printing cmd_usage() of top level commands, along with
the error. When incorrect option/command is passed to
objtool. Also change the exit code to 129, like other
objtool subcommands.

After the patch:
$ ./objtool -j
Unknown option: -j

 usage: objtool COMMAND [ARGS]

 Commands:
   check   Perform stack metadata validation on an object file
   orc     Generate in-place ORC unwind tables for an object file

$ echo $?
129

Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
---
 tools/objtool/objtool.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/objtool/objtool.c b/tools/objtool/objtool.c
index 31e0f91..07f3299 100644
--- a/tools/objtool/objtool.c
+++ b/tools/objtool/objtool.c
@@ -70,7 +70,7 @@ static void cmd_usage(void)
 
 	printf("\n");
 
-	exit(1);
+	exit(129);
 }
 
 static void handle_options(int *argc, const char ***argv)
@@ -86,9 +86,7 @@ static void handle_options(int *argc, const char ***argv)
 			break;
 		} else {
 			fprintf(stderr, "Unknown option: %s\n", cmd);
-			fprintf(stderr, "\n Usage: %s\n",
-				objtool_usage_string);
-			exit(1);
+			cmd_usage();
 		}
 
 		(*argv)++;
-- 
2.7.4

Re: [PATCH] objtool: Print top level commands on incorrect usage

[Josh Poimboeuf]

On Fri, Oct 13, 2017 at 01:51:12PM +0530, Kamalesh Babulal wrote:
> Maintain the consistency with objtool subcommands, by
> printing cmd_usage() of top level commands, along with
> the error. When incorrect option/command is passed to
> objtool. Also change the exit code to 129, like other
> objtool subcommands.
> 
> After the patch:
> $ ./objtool -j
> Unknown option: -j
> 
>  usage: objtool COMMAND [ARGS]
> 
>  Commands:
>    check   Perform stack metadata validation on an object file
>    orc     Generate in-place ORC unwind tables for an object file
> 
> $ echo $?
> 129
> 
> Cc: Ingo Molnar <mingo@kernel.org>
> Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
> ---
>  tools/objtool/objtool.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/objtool/objtool.c b/tools/objtool/objtool.c
> index 31e0f91..07f3299 100644
> --- a/tools/objtool/objtool.c
> +++ b/tools/objtool/objtool.c
> @@ -70,7 +70,7 @@ static void cmd_usage(void)
>  
>  	printf("\n");
>  
> -	exit(1);
> +	exit(129);

For consistency with the rest of the code, this should be -1 instead of
129 (though the end result is the same).

-- 
Josh

Re: [PATCH] objtool: Print top level commands on incorrect usage

[Kamalesh Babulal]

On Friday 13 October 2017 10:08 PM, Josh Poimboeuf wrote:
[...]
>> Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
>> ---
>>  tools/objtool/objtool.c | 6 ++----
>>  1 file changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/tools/objtool/objtool.c b/tools/objtool/objtool.c
>> index 31e0f91..07f3299 100644
>> --- a/tools/objtool/objtool.c
>> +++ b/tools/objtool/objtool.c
>> @@ -70,7 +70,7 @@ static void cmd_usage(void)
>>
>>  	printf("\n");
>>
>> -	exit(1);
>> +	exit(129);
>
> For consistency with the rest of the code, this should be -1 instead of
> 129 (though the end result is the same).
>

Thanks for the review. exit(129) is returned by command line parser
when the usage is incorrect, except for cmd_usage(), where the exit
code 1. I will re-send the patch with the better commit message.


-- 
cheers,
Kamalesh.