release 3.7 - a few bug fixes and a few new features.

[unix-history] / usr / src / usr.bin / ex / ex_put.c

diff --git a/usr/src/usr.bin/ex/ex_put.c b/usr/src/usr.bin/ex/ex_put.c
index 1f3c509..16ec31b 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.1 %G%";
+/* Copyright (c) 1981 Regents of the University of California */
+static char *sccsid = "@(#)ex_put.c    7.1     %G%";

 #include "ex.h"
 #include "ex_tty.h"
 #include "ex_vis.h"
 #include "ex.h"
 #include "ex_tty.h"
 #include "ex_vis.h"


@@ -300,7 +300,7 @@ flush1()
                                        outcol++;
                                        destcol++;
                                        if (XN && outcol % COLUMNS == 0)
                                        outcol++;
                                        destcol++;
                                        if (XN && outcol % COLUMNS == 0)

-                                               putch('\n');
+                                               putch('\r'), putch('\n');

                                }
                                c = *lp++;
                                if (c <= ' ')
                                }
                                c = *lp++;
                                if (c <= ' ')


@@ -636,6 +636,8 @@ dontcr:
                if (!inopen || vtube[outline]==NULL ||
                        (i=vtube[outline][outcol]) < ' ')
                        i = ' ';
                if (!inopen || vtube[outline]==NULL ||
                        (i=vtube[outline][outcol]) < ' ')
                        i = ' ';

+               if(i & QUOTE)           /* mjm: no sign extension on 3B */
+                       i = ' ';

                if (insmode && ND)
                        tputs(ND, 0, plodput);
                else
                if (insmode && ND)
                        tputs(ND, 0, plodput);
                else


@@ -735,6 +737,10 @@ putch(c)
        int c;
 {
 
        int c;
 {
 

+#ifdef OLD3BTTY                /* mjm */
+       if(c == '\n')   /* mjm: Fake "\n\r" for '\n' til fix in 3B firmware */
+               putch('\r');    /* mjm: vi does "stty -icanon" => -onlcr !! */
+#endif

        *obp++ = c & 0177;
        if (obp >= &obuf[sizeof obuf])
                flusho();
        *obp++ = c & 0177;
        if (obp >= &obuf[sizeof obuf])
                flusho();


@@ -1031,20 +1037,6 @@ setty(f)
        if (tty.c_lflag & ICANON)
                ttcharoff();
        tty = 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("\n\nPlease tell mark suspc is 377, and let him know\n");
-               printf("what you just did.  Did you hit del?\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);
 #endif
        sTTY(1);
        return (ot);


@@ -1114,39 +1106,3 @@ noonl()
 
        putchar(Outchar != termchar ? ' ' : '\n');
 }
 
        putchar(Outchar != termchar ? ' ' : '\n');
 }

-
-#ifdef SIGTSTP
-/*
- * We have just gotten a susp.  Suspend and prepare to resume.
- */
-onsusp()
-{
-       ttymode f;
-
-       f = setty(normf);
-       vnfl();
-       putpad(TE);
-       flush();
-
-       signal(SIGTSTP, SIG_DFL);
-       kill(0, SIGTSTP);
-
-       /* the pc stops here */
-
-       signal(SIGTSTP, onsusp);
-       vcontin(0);
-       setty(f);
-       if (!inopen)
-               error(0);
-       else {
-               if (vcnt < 0) {
-                       vcnt = -vcnt;
-                       if (state == VISUAL)
-                               vclear();
-                       else if (state == CRTOPEN)
-                               vcnt = 0;
-               }
-               vdirty(0, LINES);
-               vrepaint(cursor);
-       }
-}