[git commit] bc: remove "ready for more input" message, GNU bc does not print that
Denys Vlasenko
vda.linux at googlemail.com
Sat Dec 8 20:39:10 UTC 2018
commit: https://git.busybox.net/busybox/commit/?id=ac6ed11f8d432206dc0f8c8023df0962bc6b38ba
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
function old new delta
bc_read_line 285 268 -17
bc_vm_run 684 630 -54
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-71) Total: -71 bytes
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
miscutils/bc.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/miscutils/bc.c b/miscutils/bc.c
index cd38bfa42..772696a15 100644
--- a/miscutils/bc.c
+++ b/miscutils/bc.c
@@ -1282,10 +1282,9 @@ static BcStatus bc_read_line(BcVec *vec)
if (G_interrupt) { // ^C was pressed
intr:
G_interrupt = 0;
- fputs(IS_BC
- ? "\ninterrupt (type \"quit\" to exit)\n"
- : "\ninterrupt (type \"q\" to exit)\n"
- , stderr);
+ // GNU bc says "interrupted execution."
+ // GNU dc says "Interrupt!"
+ fputs("\ninterrupted execution\n", stderr);
}
# if ENABLE_FEATURE_EDITING
if (G_ttyin) {
@@ -7171,8 +7170,6 @@ static BcStatus bc_vm_stdin(void)
// Non-debug builds do not come here, they exit.
break;
}
- fflush_and_check();
- fputs("ready for more input\n", stderr);
}
bc_vec_pop_all(&buffer);
@@ -7403,13 +7400,8 @@ static BcStatus bc_vm_exec(void)
return s;
}
- if (IS_BC || (option_mask32 & BC_FLAG_I)) {
- if (s) {
- fflush_and_check();
- fputs("ready for more input\n", stderr);
- }
+ if (IS_BC || (option_mask32 & BC_FLAG_I))
s = bc_vm_stdin();
- }
if (!s && !BC_PARSE_CAN_EXEC(&G.prs))
s = bc_vm_process("");
More information about the busybox-cvs
mailing list