commit c1b7d1db9b06e497be82dfa11c36cf2d596ff6e7
author Denys Vlasenko <vda.linux@googlemail.com> Mon May 28 02:48:55 2012 +0200
committer Tanguy Pruvot <tanguy.pruvot@gmail.com> Mon May 28 03:29:02 2012 +0200
tree b5d05d10c824a8c88e59f04d62ecc8e0003ee1dc
parent 024a6c40cc9a2d953785d2b63851b60ed57c5625

Apply post-1.20.0 patches, bump version to 1.20.1

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

libbb/lineedit.c

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 1a43b17..69a1e7d 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1352,8 +1352,7 @@
 		/* fill temp_h[], retaining only last MAX_HISTORY lines */
 		memset(temp_h, 0, sizeof(temp_h));
 		idx = 0;
-		if (!ENABLE_FEATURE_EDITING_SAVE_ON_EXIT)
-			st_parm->cnt_history_in_file = 0;
+		st_parm->cnt_history_in_file = 0;
 		while ((line = xmalloc_fgetline(fp)) != NULL) {
 			if (line[0] == '\0') {
 				free(line);
@@ -1361,8 +1360,7 @@
 			}
 			free(temp_h[idx]);
 			temp_h[idx] = line;
-			if (!ENABLE_FEATURE_EDITING_SAVE_ON_EXIT)
-				st_parm->cnt_history_in_file++;
+			st_parm->cnt_history_in_file++;
 			idx++;
 			if (idx == st_parm->max_history)
 				idx = 0;