Explorar el Código

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>
Anatolij Gustschin hace 9 años
padre
commit
925c97c248
Se han modificado 1 ficheros con 3 adiciones y 0 borrados
  1. 3 0
      tools/env/fw_env.c

+ 3 - 0
tools/env/fw_env.c

@@ -1325,6 +1325,9 @@ static int parse_config ()
 	struct stat st;
 	struct stat st;
 
 
 #if defined(CONFIG_FILE)
 #if defined(CONFIG_FILE)
+	if (!common_args.config_file)
+		common_args.config_file = CONFIG_FILE;
+
 	/* Fills in DEVNAME(), ENVSIZE(), DEVESIZE(). Or don't. */
 	/* Fills in DEVNAME(), ENVSIZE(), DEVESIZE(). Or don't. */
 	if (get_config(common_args.config_file)) {
 	if (get_config(common_args.config_file)) {
 		fprintf(stderr, "Cannot parse config file '%s': %m\n",
 		fprintf(stderr, "Cannot parse config file '%s': %m\n",