bc: remove "ready for more input" message, GNU bc does not print that
authorDenys Vlasenko <vda.linux@googlemail.com>
Sat, 8 Dec 2018 20:39:10 +0000 (21:39 +0100)
committerDenys Vlasenko <vda.linux@googlemail.com>
Sat, 8 Dec 2018 20:39:10 +0000 (21:39 +0100)
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@googlemail.com>
miscutils/bc.c

index cd38bfa42be91b9527de9cb3b279d5cbfa9e98c4..772696a15c3f18bf67fd2d586fa6b2473536c6f0 100644 (file)
@@ -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("");