Clean up win32 emergency exit handling a little

diff --git a/sys/share/pcsys.c b/sys/share/pcsys.c
index 0216ace2c1236c80a411fd6195c593a026b8c5a3..78d76058531c7b84d5dd3df97dc2a885c2e52270 100644 (file)
--- a/sys/share/pcsys.c
+++ b/sys/share/pcsys.c
@@ -384,10 +384,17 @@ char *name;
        return;
 }
 
+#ifdef WIN32
+boolean getreturn_disable;
+#endif
+
 void
 getreturn(str)
 const char *str;
 {
+#ifdef WIN32
+       if (getreturn_disable) return;
+#endif
 #ifdef TOS
        msmsg("Hit <Return> %s.", str);
 #else

diff --git a/sys/winnt/nttty.c b/sys/winnt/nttty.c
index 5ce3950ff4eda2f1a7cafe12824411de97f290ae..1af1832d7b9ada7a9290b539490db3f64a7158fc 100644 (file)
--- a/sys/winnt/nttty.c
+++ b/sys/winnt/nttty.c
@@ -164,6 +164,8 @@ tty_end_screen()
        }
 }
 
+extern boolean getreturn_disable;      /* from sys/share/pcsys.c */
+
 static BOOL CtrlHandler(ctrltype)
 DWORD ctrltype;
 {
@@ -174,6 +176,7 @@ DWORD ctrltype;
                case CTRL_CLOSE_EVENT:
                case CTRL_LOGOFF_EVENT:
                case CTRL_SHUTDOWN_EVENT:
+                       getreturn_disable = TRUE;
 #ifndef NOSAVEONHANGUP
                        hangup(0);
 #endif