diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-04-06 20:55:10 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-04-06 20:55:10 +0200 |
commit | eec2e9b2433983c775a692295a3c06799a9811d4 (patch) | |
tree | 2042b2fbd5a6b4a3230d5f5db3575d3822309228 /commands/loadenv.c | |
parent | d37201edc188364e9bb1d2e747de6c7fe1af8aaf (diff) | |
parent | 46e7bfbac6fa7d674e0536e012a2cb6af16abd34 (diff) | |
download | barebox-eec2e9b2433983c775a692295a3c06799a9811d4.tar.gz barebox-eec2e9b2433983c775a692295a3c06799a9811d4.tar.xz |
Merge branch 'for-next/fs'
Diffstat (limited to 'commands/loadenv.c')
-rw-r--r-- | commands/loadenv.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/commands/loadenv.c b/commands/loadenv.c index 44e96c3b60..6469affadb 100644 --- a/commands/loadenv.c +++ b/commands/loadenv.c @@ -62,20 +62,16 @@ static int do_loadenv(int argc, char *argv[]) if (argc - optind < 1) { filename = default_environment_path_get(); } else { - char *str = normalise_path(argv[optind]); - /* * /dev/defaultenv use to contain the defaultenvironment. * we do not have this file anymore, but maintain compatibility * to the 'loadenv -s /dev/defaultenv' command to restore the * default environment for some time. */ - if (!strcmp(str, "/dev/defaultenv")) + if (!strcmp(argv[optind], "/dev/defaultenv")) defaultenv = 1; else filename = argv[optind]; - - free(str); } if (scrub) { |