summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-10-23 20:06:59 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-10-23 23:05:58 +0200
commit2d612999e0fcbd89a78bc38f7ce8bea0712f522d (patch)
treeb9dcd9f3ecd4c9a14e9091692c15c746e5e5d72c
parent51ece5e1d6d4b2fcc707cd908094d5e7e7d1f5d6 (diff)
downloadbarebox-2d612999e0fcbd89a78bc38f7ce8bea0712f522d.tar.gz
saveenv: Fix saving to specified file
Since e805b7d saveenv: provide a zeroed/empty/ignore environment barebox no longer honors the file argument when the directory argument is also givin. Fix this. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--commands/saveenv.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/commands/saveenv.c b/commands/saveenv.c
index 9da733e..43f16dc 100644
--- a/commands/saveenv.c
+++ b/commands/saveenv.c
@@ -39,16 +39,16 @@ static int do_saveenv(int argc, char *argv[])
}
/* destination and source are given? */
- if (argc == optind + 2)
- dirname = argv[optind + 1];
- else
+ if (argc - optind < 2)
dirname = "/env";
+ else
+ dirname = argv[optind + 1];
/* destination only given? */
- if (argc == optind + 1)
- filename = argv[optind];
- else
+ if (argc - optind < 1)
filename = default_environment_path_get();
+ else
+ filename = argv[optind];
ret = envfs_save(filename, dirname, envfs_flags);