Fix --noheader on fw_printenv

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>

diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index ca5507d..6b71acb 100644 (file)
--- 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 (file)
--- 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}