diff options
author | Ron Yorston <rmy@pobox.com> | 2024-09-28 08:13:32 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2024-09-28 08:13:32 +0100 |
commit | 431e2704c17d5c0e51a0cbebfb1105bd4962b3f7 (patch) | |
tree | 6ff19e48cdcab8ba8176d22813d39a375399a610 /libbb/lineedit.c | |
parent | 940f40e371695d6b247f4b406e7eb580fb91e866 (diff) | |
parent | dff444bc375e6eb4c6775dbfc753ba71b46e9797 (diff) | |
download | busybox-w32-431e2704c17d5c0e51a0cbebfb1105bd4962b3f7.tar.gz busybox-w32-431e2704c17d5c0e51a0cbebfb1105bd4962b3f7.tar.bz2 busybox-w32-431e2704c17d5c0e51a0cbebfb1105bd4962b3f7.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'libbb/lineedit.c')
-rw-r--r-- | libbb/lineedit.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c index 7f26bb8e0..8e2b37853 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c | |||
@@ -1653,12 +1653,7 @@ void FAST_FUNC show_history(const line_input_t *st) | |||
1653 | if (!st) | 1653 | if (!st) |
1654 | return; | 1654 | return; |
1655 | for (i = 0; i < st->cnt_history; i++) | 1655 | for (i = 0; i < st->cnt_history; i++) |
1656 | #if ENABLE_PLATFORM_MINGW32 | ||
1657 | /* Upstream erred, a patch has been submitted */ | ||
1658 | printf("%4d %s\n", i, st->history[i]); | 1656 | printf("%4d %s\n", i, st->history[i]); |
1659 | #else | ||
1660 | fprintf(stderr, "%4d %s\n", i, st->history[i]); | ||
1661 | #endif | ||
1662 | } | 1657 | } |
1663 | 1658 | ||
1664 | # if ENABLE_FEATURE_EDITING_SAVEHISTORY | 1659 | # if ENABLE_FEATURE_EDITING_SAVEHISTORY |
@@ -1750,7 +1745,7 @@ static void load_history(line_input_t *st_parm) | |||
1750 | } | 1745 | } |
1751 | 1746 | ||
1752 | # if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT | 1747 | # if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT |
1753 | void save_history(line_input_t *st) | 1748 | void FAST_FUNC save_history(line_input_t *st) |
1754 | { | 1749 | { |
1755 | FILE *fp; | 1750 | FILE *fp; |
1756 | 1751 | ||