diff options
author | Ron Yorston <rmy@pobox.com> | 2012-04-23 10:57:02 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2012-04-23 10:57:02 +0100 |
commit | 2903c15333636ae51db14cab009533bac68c8a30 (patch) | |
tree | 11a49598f98c505c021202564348c5639e2fb0b1 /libbb | |
parent | 5fc2c035953f71992197f6025918a8fe79ade1d3 (diff) | |
parent | f5234398ef3010b68468cafe3e2ea89b2bb08a17 (diff) | |
download | busybox-w32-2903c15333636ae51db14cab009533bac68c8a30.tar.gz busybox-w32-2903c15333636ae51db14cab009533bac68c8a30.tar.bz2 busybox-w32-2903c15333636ae51db14cab009533bac68c8a30.zip |
Merge commit '1_20_0' into merge
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/Kbuild.src | 1 | ||||
-rw-r--r-- | libbb/lineedit.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src index 4cb063f89..ad81ce46b 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src | |||
@@ -172,6 +172,7 @@ lib-$(CONFIG_PING) += inet_cksum.o | |||
172 | lib-$(CONFIG_TRACEROUTE) += inet_cksum.o | 172 | lib-$(CONFIG_TRACEROUTE) += inet_cksum.o |
173 | lib-$(CONFIG_TRACEROUTE6) += inet_cksum.o | 173 | lib-$(CONFIG_TRACEROUTE6) += inet_cksum.o |
174 | lib-$(CONFIG_UDHCPC) += inet_cksum.o | 174 | lib-$(CONFIG_UDHCPC) += inet_cksum.o |
175 | lib-$(CONFIG_UDHCPC6) += inet_cksum.o | ||
175 | lib-$(CONFIG_UDHCPD) += inet_cksum.o | 176 | lib-$(CONFIG_UDHCPD) += inet_cksum.o |
176 | 177 | ||
177 | # We shouldn't build xregcomp.c if we don't need it - this ensures we don't | 178 | # We shouldn't build xregcomp.c if we don't need it - this ensures we don't |
diff --git a/libbb/lineedit.c b/libbb/lineedit.c index 78244c395..77dc1c607 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c | |||
@@ -2532,7 +2532,7 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman | |||
2532 | switch (ic) { | 2532 | switch (ic) { |
2533 | //case KEYCODE_LEFT: - bash doesn't do this | 2533 | //case KEYCODE_LEFT: - bash doesn't do this |
2534 | case 'b': | 2534 | case 'b': |
2535 | ctrl_left(); | 2535 | ctrl_left(); |
2536 | break; | 2536 | break; |
2537 | //case KEYCODE_RIGHT: - bash doesn't do this | 2537 | //case KEYCODE_RIGHT: - bash doesn't do this |
2538 | case 'f': | 2538 | case 'f': |