diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-04-09 12:14:06 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-04-28 11:41:02 +0200 |
commit | ebb8a4b59466dd366b6a04e3684e114a02cd8234 (patch) | |
tree | 24baffb61013372c002953815a64b995c14ee258 /commands/saveenv.c | |
parent | 54bea204e298daea8ea545c03f278fe3e778198c (diff) | |
download | barebox-ebb8a4b59466dd366b6a04e3684e114a02cd8234.tar.gz barebox-ebb8a4b59466dd366b6a04e3684e114a02cd8234.tar.xz |
env: erase/protect in envfs_save
So that the envfs_save is more useful outside of the saveenv command
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands/saveenv.c')
-rw-r--r-- | commands/saveenv.c | 46 |
1 files changed, 1 insertions, 45 deletions
diff --git a/commands/saveenv.c b/commands/saveenv.c index 8ead98dee0..cb2b01db54 100644 --- a/commands/saveenv.c +++ b/commands/saveenv.c @@ -29,7 +29,7 @@ static int do_saveenv(int argc, char *argv[]) { - int ret, fd; + int ret; char *filename, *dirname; printf("saving environment\n"); @@ -42,52 +42,8 @@ static int do_saveenv(int argc, char *argv[]) else filename = argv[1]; - fd = open(filename, O_WRONLY | O_CREAT); - if (fd < 0) { - printf("could not open %s: %s\n", filename, errno_str()); - return 1; - } - - ret = protect(fd, ~0, 0, 0); - - /* ENOSYS is no error here, many devices do not need it */ - if (ret && errno != ENOSYS) { - printf("could not unprotect %s: %s\n", filename, errno_str()); - close(fd); - return 1; - } - - ret = erase(fd, ~0, 0); - - /* ENOSYS is no error here, many devices do not need it */ - if (ret && errno != ENOSYS) { - printf("could not erase %s: %s\n", filename, errno_str()); - close(fd); - return 1; - } - - close(fd); - ret = envfs_save(filename, dirname); - if (ret) { - printf("saveenv failed\n"); - goto out; - } - - fd = open(filename, O_WRONLY | O_CREAT); - - ret = protect(fd, ~0, 0, 1); - - /* ENOSYS is no error here, many devices do not need it */ - if (ret && errno != ENOSYS) { - printf("could not protect %s: %s\n", filename, errno_str()); - close(fd); - return 1; - } - ret = 0; -out: - close(fd); return ret; } |