diff options
| author | Denys Vlasenko | 2012-05-28 02:48:55 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2012-05-28 02:48:55 +0200 |
| commit | aa4e5092f58f5a11018e569aee9cf037daf8c5d6 (patch) | |
| tree | f8c01df8f7eb3dda4c0292df3548d9fced5e3297 /libbb/lineedit.c | |
| parent | f5234398ef3010b68468cafe3e2ea89b2bb08a17 (diff) | |
| download | busybox-aa4e5092f58f5a11018e569aee9cf037daf8c5d6.zip busybox-aa4e5092f58f5a11018e569aee9cf037daf8c5d6.tar.gz | |
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/lineedit.c')
| -rw-r--r-- | libbb/lineedit.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c index db84167..b89748a 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; |