tools/env: fw_printenv pass value_only as argument

Signed-off-by: Andreas Fenkart <andreas.fenkart@digitalstrom.com>

diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index 0c448079cc3b5ac7eeffece63bfad54a85bdef52..aa394858a08520d203001404442781d158e277ef 100644 (file)
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -239,7 +239,7 @@ int parse_aes_key(char *key, uint8_t *bin_key)
  * Print the current definition of one, or more, or all
  * environment variables
  */
-int fw_printenv (int argc, char *argv[])
+int fw_printenv(int argc, char *argv[], int value_only)
 {
        char *env, *nxt;
        int i, rc = 0;
@@ -262,7 +262,7 @@ int fw_printenv (int argc, char *argv[])
                return 0;
        }
 
-       if (printenv_args.name_suppress && argc != 1) {
+       if (value_only && argc != 1) {
                fprintf(stderr,
                        "## Error: `-n' option requires exactly one argument\n");
                return -1;
@@ -283,7 +283,7 @@ int fw_printenv (int argc, char *argv[])
                        }
                        val = envmatch (name, env);
                        if (val) {
-                               if (!printenv_args.name_suppress) {
+                               if (!value_only) {
                                        fputs (name, stdout);
                                        putc ('=', stdout);
                                }

diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
index 7345922911f11a83ba4973c79425e0b00c43d5f9..d4daeeafd973f87164f306ba98747bd69ea2906e 100644 (file)
--- a/tools/env/fw_env.h
+++ b/tools/env/fw_env.h
@@ -67,7 +67,7 @@ struct common_args {
 extern struct common_args common_args;
 
 struct printenv_args {
-       int name_suppress;
+       int value_only;
 };
 extern struct printenv_args printenv_args;
 
@@ -78,7 +78,7 @@ extern struct setenv_args setenv_args;
 
 int parse_aes_key(char *key, uint8_t *bin_key);
 
-int   fw_printenv(int argc, char *argv[]);
+int fw_printenv(int argc, char *argv[], int value_only);
 char *fw_getenv(char *name);
 int fw_setenv(int argc, char *argv[]);
 int fw_parse_script(char *fname);

diff --git a/tools/env/fw_env_main.c b/tools/env/fw_env_main.c
index 3706d8f1a619cfba20b1c83e5ecb8f1d40d8265c..2a45a0de2876fa2b0c3dfef6f1d07ea054ef6c56 100644 (file)
--- a/tools/env/fw_env_main.c
+++ b/tools/env/fw_env_main.c
@@ -151,7 +151,7 @@ int parse_printenv_args(int argc, char *argv[])
               EOF) {
                switch (c) {
                case 'n':
-                       printenv_args.name_suppress = 1;
+                       printenv_args.value_only = 1;
                        break;
                case 'a':
                case 'c':
@@ -240,7 +240,7 @@ int main(int argc, char *argv[])
        }
 
        if (do_printenv) {
-               if (fw_printenv(argc, argv) != 0)
+               if (fw_printenv(argc, argv, printenv_args.value_only))
                        retval = EXIT_FAILURE;
        } else {
                if (!setenv_args.script_file) {