final 3.6 release - took out TIMEBOMB code

SCCS-vsn: usr.bin/ex/ex_cmds.c 6.3
SCCS-vsn: usr.bin/ex/ex_put.c 6.3
SCCS-vsn: usr.bin/ex/Makefile 6.4

diff --git a/usr/src/usr.bin/ex/Makefile b/usr/src/usr.bin/ex/Makefile
index 75277b1..43bcc26 100644 (file)
--- a/usr/src/usr.bin/ex/Makefile
+++ b/usr/src/usr.bin/ex/Makefile
@@ -28,9 +28,7 @@ XSTR= ${BINDIR}/xstr
 DEBUGFLAGS=    -DTRACE -g
 NONDEBUGFLAGS= -O
 DEB=   ${NONDEBUGFLAGS}        # or ${DEBUGFLAGS} to to debug
-# NOTE: TIMEBOMB is NOT intended for production use, or even to
-# get off our vax.  It is there to help nail a bug that happens rarely.
-CFLAGS=        -DTABS=8 -DCRYPT -DLISPCODE -DCHDIR -DUCVISUAL -DVFORK -DVMUNIX -DTIMEBOMB ${DEB}
+CFLAGS=        -DTABS=8 -DCRYPT -DLISPCODE -DCHDIR -DUCVISUAL -DVFORK -DVMUNIX ${DEB}
 LDFLAGS=       -z              # or -i or -n
 TERMLIB=       -ltermcap
 MKSTR= ${BINDIR}/mkstr

diff --git a/usr/src/usr.bin/ex/ex_cmds.c b/usr/src/usr.bin/ex/ex_cmds.c
index 4136549..8c8f9d5 100644 (file)
--- a/usr/src/usr.bin/ex/ex_cmds.c
+++ b/usr/src/usr.bin/ex/ex_cmds.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 1980 Regents of the University of California */
-static char *sccsid = "@(#)ex_cmds.c   6.2 %G%";
+static char *sccsid = "@(#)ex_cmds.c   6.3 %G%";
 #include "ex.h"
 #include "ex_argv.h"
 #include "ex_temp.h"

diff --git a/usr/src/usr.bin/ex/ex_put.c b/usr/src/usr.bin/ex/ex_put.c
index f60a6a7..f88955f 100644 (file)
--- a/usr/src/usr.bin/ex/ex_put.c
+++ b/usr/src/usr.bin/ex/ex_put.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 1980 Regents of the University of California */
-static char *sccsid = "@(#)ex_put.c    6.2 %G%";
+static char *sccsid = "@(#)ex_put.c    6.3 %G%";
 #include "ex.h"
 #include "ex_tty.h"
 #include "ex_vis.h"
@@ -1031,20 +1031,6 @@ setty(f)
        if (tty.c_lflag & ICANON)
                ttcharoff();
        tty = f;
-#endif
-#ifdef TIMEBOMB
-       /*
-        * The following is a TEMPORARY hack to help track down a bug.
-        * It is never intended to get off Ernie CoVax.
-        */
-       if (f == normf && nlttyc.t_suspc == '\377') {
-               printf("\r\n\nPlease tell mark suspc is 377, and let him know\r\n");
-               printf("what you just did.  Did you hit del?\r\n");
-               nlttyc.t_suspc = CTRL(z);
-               nlttyc.t_dsuspc = CTRL(y);
-               nlttyc.t_flushc = CTRL(o);
-               nlttyc.t_lnextc = CTRL(v);
-       }
 #endif
        sTTY(1);
        return (ot);