[PATCH] Return error code in case of invalid command line option

[PATCH] Return error code in case of invalid command line option

[Vivek Goyal]

Currently kexec returns success even if an invalid command line option
is encountered. Kexec currently prints usage message and then returns
0. That's not right. It is an error and error code 1 should be returned.

Due to this wrapper script thinks that kdump succeeded but that's not
the case.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
 kexec/kexec.c |    2 ++
 1 file changed, 2 insertions(+)

Index: kexec-tools/kexec/kexec.c
===================================================================
--- kexec-tools.orig/kexec/kexec.c	2014-08-28 15:36:17.563115135 -0400
+++ kexec-tools/kexec/kexec.c	2014-09-03 11:19:46.505871590 -0400
@@ -1209,6 +1209,8 @@ int main(int argc, char *argv[])
 				  options, 0)) != -1) {
 		switch(opt) {
 		case '?':
+			usage();
+			return 1;
 		case OPT_HELP:
 			usage();
 			return 0;

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH] Return error code in case of invalid command line option

[Simon Horman]

On Wed, Sep 03, 2014 at 11:29:17AM -0400, Vivek Goyal wrote:
> Currently kexec returns success even if an invalid command line option
> is encountered. Kexec currently prints usage message and then returns
> 0. That's not right. It is an error and error code 1 should be returned.
> 
> Due to this wrapper script thinks that kdump succeeded but that's not
> the case.
> 
> Signed-off-by: Vivek Goyal <vgoyal@redhat.com>

Thanks, applied.

> ---
>  kexec/kexec.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> Index: kexec-tools/kexec/kexec.c
> ===================================================================
> --- kexec-tools.orig/kexec/kexec.c	2014-08-28 15:36:17.563115135 -0400
> +++ kexec-tools/kexec/kexec.c	2014-09-03 11:19:46.505871590 -0400
> @@ -1209,6 +1209,8 @@ int main(int argc, char *argv[])
>  				  options, 0)) != -1) {
>  		switch(opt) {
>  		case '?':
> +			usage();
> +			return 1;
>  		case OPT_HELP:
>  			usage();
>  			return 0;
> 

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec