Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell

[oweals/u-boot.git] / tools / env / fw_env_main.c

diff --git a/tools/env/fw_env_main.c b/tools/env/fw_env_main.c
index 6e278ca80b4dd5676d2364657d7bb35b0658c751..1d193bd437d83ddfd78508765959f1c4561923c7 100644 (file)
--- a/tools/env/fw_env_main.c
+++ b/tools/env/fw_env_main.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2008
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -27,6 +26,7 @@
  * of AES key), eg. '-a aabbccddeeff00112233445566778899'.
  */
 
+#include <env.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <stdio.h>
@@ -34,6 +34,7 @@
 #include <stdlib.h>
 #include <sys/file.h>
 #include <unistd.h>
+#include <version.h>
 #include "fw_env_private.h"
 #include "fw_env.h"
 
@@ -42,12 +43,12 @@
 static int do_printenv;
 
 static struct option long_options[] = {
-       {"aes", required_argument, NULL, 'a'},
        {"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}
 };
 
@@ -67,9 +68,7 @@ void usage_printenv(void)
                "Print variables from U-Boot environment\n"
                "\n"
                " -h, --help           print this help.\n"
-#ifdef CONFIG_ENV_AES
-               " -a, --aes            aes key to access environment\n"
-#endif
+               " -v, --version        display version\n"
 #ifdef CONFIG_FILE
                " -c, --config         configuration file, default:" CONFIG_FILE "\n"
 #endif
@@ -85,9 +84,7 @@ void usage_env_set(void)
                "Modify variables in U-Boot environment\n"
                "\n"
                " -h, --help           print this help.\n"
-#ifdef CONFIG_ENV_AES
-               " -a, --aes            aes key to access environment\n"
-#endif
+               " -v, --version        display version\n"
 #ifdef CONFIG_FILE
                " -c, --config         configuration file, default:" CONFIG_FILE "\n"
 #endif
@@ -123,16 +120,9 @@ static void parse_common_args(int argc, char *argv[])
        env_opts.config_file = CONFIG_FILE;
 #endif
 
-       while ((c = getopt_long(argc, argv, ":a:c:l:h", long_options, NULL)) !=
+       while ((c = getopt_long(argc, argv, ":a:c:l:h:v", long_options, NULL)) !=
               EOF) {
                switch (c) {
-               case 'a':
-                       if (parse_aes_key(optarg, env_opts.aes_key)) {
-                               fprintf(stderr, "AES key parse error\n");
-                               exit(EXIT_FAILURE);
-                       }
-                       env_opts.aes_flag = 1;
-                       break;
 #ifdef CONFIG_FILE
                case 'c':
                        env_opts.config_file = optarg;
@@ -145,6 +135,10 @@ static void parse_common_args(int argc, char *argv[])
                        do_printenv ? usage_printenv() : usage_env_set();
                        exit(EXIT_SUCCESS);
                        break;
+               case 'v':
+                       fprintf(stderr, "Compiled with " U_BOOT_VERSION "\n");
+                       exit(EXIT_SUCCESS);
+                       break;
                default:
                        /* ignore unknown options */
                        break;
@@ -162,7 +156,7 @@ int parse_printenv_args(int argc, char *argv[])
 
        parse_common_args(argc, argv);
 
-       while ((c = getopt_long(argc, argv, "a:c:ns:l:h", long_options, NULL))
+       while ((c = getopt_long(argc, argv, "a:c:ns:l:h:v", long_options, NULL))
                != EOF) {
                switch (c) {
                case 'n':
@@ -189,7 +183,7 @@ int parse_setenv_args(int argc, char *argv[])
 
        parse_common_args(argc, argv);
 
-       while ((c = getopt_long(argc, argv, "a:c:ns:l:h", long_options, NULL))
+       while ((c = getopt_long(argc, argv, "a:c:ns:l:h:v", long_options, NULL))
                != EOF) {
                switch (c) {
                case 's':
@@ -245,7 +239,7 @@ int main(int argc, char *argv[])
        argv += optind;
 
        if (env_opts.lockname) {
-               lockname = malloc(sizeof(env_opts.lockname) +
+               lockname = malloc(strlen(env_opts.lockname) +
                                sizeof(CMD_PRINTENV) + 10);
                if (!lockname) {
                        fprintf(stderr, "Unable allocate memory");