[PATCH] of_node: clearify help text and do stricter commandline parsing

[PATCH] of_node: clearify help text and do stricter commandline parsing

[Uwe Kleine-König]

To create an oftree node /path/node I tried after reading the help text
of of_node:

	of_node -c /path node

similar to the syntax of of_property. This didnt result in any output
but still failed to do what I meant.

So clearify the help text to not suggest there are two parameters and
return an usage error if still two (or more) names are passed.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 commands/of_node.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/commands/of_node.c b/commands/of_node.c
index 29cc371dd289..28c4357c5d97 100644
--- a/commands/of_node.c
+++ b/commands/of_node.c
@@ -107,11 +107,10 @@ static int do_of_node(int argc, char *argv[])
 		}
 	}
 
-	if (optind == argc)
+	if (optind + 1 != argc)
 		return COMMAND_ERROR_USAGE;
 
-	if (optind < argc)
-		path = argv[optind];
+	path = argv[optind];
 
 	if (!path)
 		return COMMAND_ERROR_USAGE;
@@ -147,7 +146,7 @@ BAREBOX_CMD_HELP_END
 BAREBOX_CMD_START(of_node)
 	.cmd		= do_of_node,
 	BAREBOX_CMD_DESC("create/delete nodes in the device tree")
-	BAREBOX_CMD_OPTS("[-cd] [-f] NODE NAME")
+	BAREBOX_CMD_OPTS("[-cd] [-f] NODEPATH")
 	BAREBOX_CMD_GROUP(CMD_GRP_MISC)
 	BAREBOX_CMD_COMPLETE(devicetree_complete)
 	BAREBOX_CMD_HELP(cmd_of_node_help)
-- 
2.18.0


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

Re: [PATCH] of_node: clearify help text and do stricter commandline parsing

[Sascha Hauer]

On Mon, Aug 06, 2018 at 09:14:18PM +0200, Uwe Kleine-König wrote:
> To create an oftree node /path/node I tried after reading the help text
> of of_node:
> 
> 	of_node -c /path node
> 
> similar to the syntax of of_property. This didnt result in any output
> but still failed to do what I meant.
> 
> So clearify the help text to not suggest there are two parameters and
> return an usage error if still two (or more) names are passed.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  commands/of_node.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/commands/of_node.c b/commands/of_node.c
> index 29cc371dd289..28c4357c5d97 100644
> --- a/commands/of_node.c
> +++ b/commands/of_node.c
> @@ -107,11 +107,10 @@ static int do_of_node(int argc, char *argv[])
>  		}
>  	}
>  
> -	if (optind == argc)
> +	if (optind + 1 != argc)
>  		return COMMAND_ERROR_USAGE;
>  
> -	if (optind < argc)
> -		path = argv[optind];
> +	path = argv[optind];
>  
>  	if (!path)
>  		return COMMAND_ERROR_USAGE;
> @@ -147,7 +146,7 @@ BAREBOX_CMD_HELP_END
>  BAREBOX_CMD_START(of_node)
>  	.cmd		= do_of_node,
>  	BAREBOX_CMD_DESC("create/delete nodes in the device tree")
> -	BAREBOX_CMD_OPTS("[-cd] [-f] NODE NAME")
> +	BAREBOX_CMD_OPTS("[-cd] [-f] NODEPATH")
>  	BAREBOX_CMD_GROUP(CMD_GRP_MISC)
>  	BAREBOX_CMD_COMPLETE(devicetree_complete)
>  	BAREBOX_CMD_HELP(cmd_of_node_help)
> -- 
> 2.18.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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