diff options
| author | Denys Vlasenko | 2010-07-25 00:13:27 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2010-07-25 00:13:27 +0200 |
| commit | 503a07cab24a1e58099a04970babd2b761469449 (patch) | |
| tree | f96b01fd405adcbcbeed0086389da27bd1a07ccc /libbb | |
| parent | b2d95147c989448f23cc59c63b83e2d89f0bd9cd (diff) | |
| download | busybox-503a07cab24a1e58099a04970babd2b761469449.zip busybox-503a07cab24a1e58099a04970babd2b761469449.tar.gz | |
Apply post-1.17.0 fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/Config.src | 2 | ||||
| -rw-r--r-- | libbb/lineedit.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libbb/Config.src b/libbb/Config.src index 80b1e0d..09bf892 100644 --- a/libbb/Config.src +++ b/libbb/Config.src @@ -98,7 +98,7 @@ config FEATURE_USERNAME_COMPLETION config FEATURE_EDITING_FANCY_PROMPT bool "Fancy shell prompts" - default n + default y depends on FEATURE_EDITING help Setting this option allows for prompts to use things like \w and diff --git a/libbb/lineedit.c b/libbb/lineedit.c index 8a2ea79..a9b790c 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c @@ -1765,11 +1765,13 @@ static void cmdedit_setwidth(unsigned w, int redraw_flg) static void win_changed(int nsig) { + int sv_errno = errno; unsigned width; get_terminal_width_height(0, &width, NULL); cmdedit_setwidth(width, nsig /* - just a yes/no flag */); if (nsig == SIGWINCH) signal(SIGWINCH, win_changed); /* rearm ourself */ + errno = sv_errno; } static int lineedit_read_key(char *read_key_buffer) |