| Message ID | 1518369406-3367-1-git-send-email-alex.kiernan@gmail.com |
|---|---|
| State | Accepted |
| Commit | d877a6c50e886af089bf8fb947e566982672fd0a |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,v2] Fix --noheader on fw_printenv | expand |
On Sun, Feb 11, 2018 at 05:16:46PM +0000, Alex Kiernan wrote: > The single argument `--noheader' is expecting isn't taken from getopt > parsing, but instead from the remaining argv arguments. > > Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Applied to u-boot/master, thanks!
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index ca5507d..6b71acb 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -452,7 +452,7 @@ int fw_printenv(int argc, char *argv[], int value_only, struct env_opts *opts) if (value_only && argc != 1) { fprintf(stderr, - "## Error: `-n' option requires exactly one argument\n"); + "## Error: `-n'/`--noheader' option requires exactly one argument\n"); return -1; } diff --git a/tools/env/fw_env_main.c b/tools/env/fw_env_main.c index 6fdf41c..d93a915 100644 --- a/tools/env/fw_env_main.c +++ b/tools/env/fw_env_main.c @@ -46,7 +46,7 @@ static struct option long_options[] = { {"config", required_argument, NULL, 'c'}, {"help", no_argument, NULL, 'h'}, {"script", required_argument, NULL, 's'}, - {"noheader", required_argument, NULL, 'n'}, + {"noheader", no_argument, NULL, 'n'}, {"lock", required_argument, NULL, 'l'}, {"version", no_argument, NULL, 'v'}, {NULL, 0, NULL, 0}
The single argument `--noheader' is expecting isn't taken from getopt parsing, but instead from the remaining argv arguments. Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> --- Changes in v2: - Simplified commit message, improved error message tools/env/fw_env.c | 2 +- tools/env/fw_env_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)