summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2020-04-16 18:40:42 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2020-04-16 18:40:42 +0200
commit049a1415c609a1134a15c5f8c4b0a4fe09514f10 (patch)
treedb5de9a483a2a421d3604e1e8b183b05252cfd24 /commands
parenta142fa62b8d3c82f8da95dfb136ca986e7d31dd4 (diff)
parent46312a239f193d41b2862a0b9e57e7bae3ec2f03 (diff)
downloadbarebox-049a1415c609a1134a15c5f8c4b0a4fe09514f10.tar.gz
barebox-049a1415c609a1134a15c5f8c4b0a4fe09514f10.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'commands')
-rw-r--r--commands/of_property.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/commands/of_property.c b/commands/of_property.c
index 31e9b71dd7..1d7ba181d5 100644
--- a/commands/of_property.c
+++ b/commands/of_property.c
@@ -315,7 +315,7 @@ static int do_of_property(int argc, char *argv[])
int delete = 0;
int set = 0;
int fixup = 0;
- char *path = NULL, *propname = NULL;
+ char *path, *propname;
while ((opt = getopt(argc, argv, "dsf")) > 0) {
switch (opt) {
@@ -333,14 +333,11 @@ static int do_of_property(int argc, char *argv[])
}
}
- if (optind == argc)
+ if (argc - optind < 2)
return COMMAND_ERROR_USAGE;
- if (optind < argc)
- path = argv[optind];
-
- if (optind + 1 < argc)
- propname = argv[optind + 1];
+ path = argv[optind];
+ propname = argv[optind + 1];
debug("path: %s propname: %s\n", path, propname);