From 6b474c533020ea50fe0b2118027a9cea9318ba13 Mon Sep 17 00:00:00 2001
From: Taylor R Campbell <campbell@mumble.net>
Date: Sat, 16 Apr 2011 00:25:41 +0000
Subject: [PATCH] Make `--batch-mode' without `--interactive' imply
 non-interactive.

In this case, don't check whether stdin/stdout/stderr are ttys to
determine whether we are interactive.

This keeps `scheme --batch-mode' from futzing with the tty interrupt
characters, so that if you run it from a script, there is no window
during which ^G becomes the terminal's interrupt character and ^C its
quit character.  E.g., if you have set `stty intr ^C', then Scheme
won't interfere with that while you run your script.
---
 src/etc/build-bands.sh |  2 +-
 src/etc/compile.sh     |  2 +-
 src/microcode/uxtop.c  | 14 +++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/etc/build-bands.sh b/src/etc/build-bands.sh
index d9fa10c3e..7aca80ba6 100755
--- a/src/etc/build-bands.sh
+++ b/src/etc/build-bands.sh
@@ -29,7 +29,7 @@ set -e
 FASL=`get_fasl_file`
 
 run_cmd_in_dir runtime ../microcode/scheme --library ../lib --heap 6000 \
-    --fasl "${FASL}" <<EOF
+    --fasl "${FASL}" --batch-mode <<EOF
 (begin
   (disk-save "../lib/runtime.com")
   (load-option (quote compiler))
diff --git a/src/etc/compile.sh b/src/etc/compile.sh
index d1dbfb2b0..eb2425680 100755
--- a/src/etc/compile.sh
+++ b/src/etc/compile.sh
@@ -26,7 +26,7 @@ set -e
 
 . etc/functions.sh
 
-run_cmd "${@}" --heap 6000 --stack 200 <<EOF
+run_cmd "${@}" --heap 6000 --stack 200 --batch-mode <<EOF
 (begin
   (load "etc/compile.scm")
   (compile-everything))
diff --git a/src/microcode/uxtop.c b/src/microcode/uxtop.c
index 26b8c38a2..611f3e521 100644
--- a/src/microcode/uxtop.c
+++ b/src/microcode/uxtop.c
@@ -74,11 +74,15 @@ OS_initialize (void)
 {
   initialize_interruptable_extent ();
   {
-    interactive =
-      (option_force_interactive
-       || (isatty (STDIN_FILENO))
-       || (isatty (STDOUT_FILENO))
-       || (isatty (STDERR_FILENO)));
+    if (option_force_interactive)
+      interactive = true;
+    else if (option_batch_mode)
+      interactive = false;
+    else
+      interactive
+	= ((isatty (STDIN_FILENO))
+	   || (isatty (STDOUT_FILENO))
+	   || (isatty (STDERR_FILENO)));
     /* If none of the stdio streams is a terminal, disassociate us
        from the controlling terminal so that we're not affected by
        keyboard interrupts or hangup signals.  However, if we're
-- 
2.25.1