signal handler repairs; phil@cs.wwu.edu

2 files changed, 5 insertions, 6 deletions

diff --git a/gnu/usr.bin/bc/bc/execute.c b/gnu/usr.bin/bc/bc/execute.c
index c8f3df26135..0ef9bb98795 100644
--- a/gnu/usr.bin/bc/bc/execute.c
+++ b/gnu/usr.bin/bc/bc/execute.c
@@ -41,8 +41,6 @@ stop_execution (sig)
      int sig;
 {
   had_sigint = TRUE;
-  printf ("\n");
-  rt_error ("interrupted execution");
 }
 
 
@@ -87,10 +85,11 @@ execute ()
   if (interactive)
     {
       signal (SIGINT, stop_execution);
-      had_sigint = FALSE;
     }
    
-  while (pc.pc_addr < functions[pc.pc_func].f_code_size && !runtime_error)
+  had_sigint = FALSE;
+  while (pc.pc_addr < functions[pc.pc_func].f_code_size
+	 && !runtime_error && !had_sigint)
     {
       inst = byte(&pc);
 
@@ -543,7 +542,7 @@ execute ()
     {
       signal (SIGINT, use_quit);
       if (had_sigint)
-	printf ("Interruption completed.\n");
+	printf ("\ninterrupted execution.\n");
     }
 }
 
diff --git a/gnu/usr.bin/bc/bc/main.c b/gnu/usr.bin/bc/bc/main.c
index 29a334fb0fb..87a9feb3af2 100644
--- a/gnu/usr.bin/bc/bc/main.c
+++ b/gnu/usr.bin/bc/bc/main.c
@@ -325,6 +325,6 @@ void
 use_quit (sig)
      int sig;
 {
-  printf ("\n(interrupt) use quit to exit.\n");
+  write (1, "\n(interrupt) use quit to exit.\n", 31);
   signal (SIGINT, use_quit);
 }