From: Joe Hershberger <joe.hershberger@ni.com>
Date: Fri, 8 Feb 2013 10:12:34 +0000 (+0000)
Subject: env: Avoid clobbering an edited variable on ctrl-c
X-Git-Tag: v2013.04-rc1~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=18a3cce9fa9030e0e1fe0678ddcd0ae84d9423ca;p=oweals%2Fu-boot.git

env: Avoid clobbering an edited variable on ctrl-c

If readline says there was an error, don't write to the variable!

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index d646d90880..3a05e60103 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -552,7 +552,8 @@ static int do_env_edit(cmd_tbl_t *cmdtp, int flag, int argc,
 	else
 		buffer[0] = '\0';
 
-	readline_into_buffer("edit: ", buffer, 0);
+	if (readline_into_buffer("edit: ", buffer, 0) < 0)
+		return 1;
 
 	return setenv(argv[1], buffer);
 }