apply BusyBox 1.20.0 hotfixes

[busybox-power] / debian / patches / 0001-lineedit-fix-history-saving-when-history-MAX_HISTORY.patch

diff --git a/debian/patches/0001-lineedit-fix-history-saving-when-history-MAX_HISTORY.patch b/debian/patches/0001-lineedit-fix-history-saving-when-history-MAX_HISTORY.patch
deleted file mode 100644 (file)
index 70020fd..0000000
--- a/debian/patches/0001-lineedit-fix-history-saving-when-history-MAX_HISTORY.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 75e6cc9e70e426f7cdfd552585506360d7537f7c Mon Sep 17 00:00:00 2001
-From: Dennis Groenen <tj.groenen@gmail.com>
-Date: Wed, 7 Sep 2011 20:24:21 +0200
-Subject: [PATCH 1/4] lineedit: fix history saving when history < MAX_HISTORY
-
----
- libbb/lineedit.c |    6 ++----
- 1 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/libbb/lineedit.c b/libbb/lineedit.c
-index 603bbfc..a8b4609 100644
---- a/libbb/lineedit.c
-+++ b/libbb/lineedit.c
-@@ -1352,8 +1352,7 @@ static void load_history(line_input_t *st_parm)
-               /* 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 @@ static void load_history(line_input_t *st_parm)
-                       }
-                       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;
--- 
-1.7.6.1
-