aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2012-05-28 02:48:55 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2012-05-28 02:48:55 +0200
commitaa4e5092f58f5a11018e569aee9cf037daf8c5d6 (patch)
treef8c01df8f7eb3dda4c0292df3548d9fced5e3297 /libbb
parentf5234398ef3010b68468cafe3e2ea89b2bb08a17 (diff)
downloadbusybox-w32-1_20_1.tar.gz
busybox-w32-1_20_1.tar.bz2
busybox-w32-1_20_1.zip
Apply post-1.20.0 patches, bump version to 1.20.11_20_1
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/lineedit.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index db8416712..b89748a1c 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1352,8 +1352,7 @@ static void load_history(line_input_t *st_parm)
1352 /* fill temp_h[], retaining only last MAX_HISTORY lines */ 1352 /* fill temp_h[], retaining only last MAX_HISTORY lines */
1353 memset(temp_h, 0, sizeof(temp_h)); 1353 memset(temp_h, 0, sizeof(temp_h));
1354 idx = 0; 1354 idx = 0;
1355 if (!ENABLE_FEATURE_EDITING_SAVE_ON_EXIT) 1355 st_parm->cnt_history_in_file = 0;
1356 st_parm->cnt_history_in_file = 0;
1357 while ((line = xmalloc_fgetline(fp)) != NULL) { 1356 while ((line = xmalloc_fgetline(fp)) != NULL) {
1358 if (line[0] == '\0') { 1357 if (line[0] == '\0') {
1359 free(line); 1358 free(line);
@@ -1361,8 +1360,7 @@ static void load_history(line_input_t *st_parm)
1361 } 1360 }
1362 free(temp_h[idx]); 1361 free(temp_h[idx]);
1363 temp_h[idx] = line; 1362 temp_h[idx] = line;
1364 if (!ENABLE_FEATURE_EDITING_SAVE_ON_EXIT) 1363 st_parm->cnt_history_in_file++;
1365 st_parm->cnt_history_in_file++;
1366 idx++; 1364 idx++;
1367 if (idx == st_parm->max_history) 1365 if (idx == st_parm->max_history)
1368 idx = 0; 1366 idx = 0;