From: Anatolij Gustschin <agust@denx.de>
Date: Fri, 29 Apr 2016 20:00:11 +0000 (+0200)
Subject: tools: env: fix config file loading in env library
X-Git-Tag: v2016.05~35
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=925c97c248527391de32c2926f7e1911850fd4b0;p=oweals%2Fu-boot.git

tools: env: fix config file loading in env library

env library is broken as the config file pointer is only initialized
in main(). When running in the env library parse_config() fails:

  Cannot parse config file '(null)': Bad address

Ensure that config file pointer is always initialized.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
---

diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index 1420ac58a3..06cf63daa4 100644
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -1325,6 +1325,9 @@ static int parse_config ()
 	struct stat st;
 
 #if defined(CONFIG_FILE)
+	if (!common_args.config_file)
+		common_args.config_file = CONFIG_FILE;
+
 	/* Fills in DEVNAME(), ENVSIZE(), DEVESIZE(). Or don't. */
 	if (get_config(common_args.config_file)) {
 		fprintf(stderr, "Cannot parse config file '%s': %m\n",