Sun version and make install fixes

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

diff --git a/usr/src/usr.bin/ex/ex_unix.c b/usr/src/usr.bin/ex/ex_unix.c
index fecdd1a..af10366 100644 (file)
--- a/usr/src/usr.bin/ex/ex_unix.c
+++ b/usr/src/usr.bin/ex/ex_unix.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 1979 Regents of the University of California */
 /* Copyright (c) 1979 Regents of the University of California */

-static char *sccsid = "@(#)ex_unix.c   4.2;
+static char *sccsid = "@(#)ex_unix.c   6.1 10/18/80";

 #include "ex.h"
 #include "ex_temp.h"
 #include "ex_tty.h"
 #include "ex.h"
 #include "ex_temp.h"
 #include "ex_tty.h"


@@ -131,7 +131,7 @@ unixex(opt, up, newstdin, mode)
        ttymode f;
 
        signal(SIGINT, SIG_IGN);
        ttymode f;
 
        signal(SIGINT, SIG_IGN);

-#ifdef TIOCLGET
+#ifdef SIGTSTP

        if (dosusp)
                signal(SIGTSTP, SIG_DFL);
 #endif
        if (dosusp)
                signal(SIGTSTP, SIG_DFL);
 #endif


@@ -207,7 +207,7 @@ unixwt(c, f)
 {
 
        waitfor();
 {
 
        waitfor();

-#ifdef TIOCLGET
+#ifdef SIGTSTP

        if (dosusp)
                signal(SIGTSTP, onsusp);
 #endif
        if (dosusp)
                signal(SIGTSTP, onsusp);
 #endif


@@ -232,7 +232,7 @@ filter(mode)
        register int mode;
 {
        static int pvec[2];
        register int mode;
 {
        static int pvec[2];

-       register ttymode f;
+       ttymode f;      /* mjm: was register */

        register int lines = lineDOL();
 
        mode++;
        register int lines = lineDOL();
 
        mode++;


@@ -251,7 +251,7 @@ filter(mode)
                        setrupt();
                        io = pvec[1];
                        close(pvec[0]);
                        setrupt();
                        io = pvec[1];
                        close(pvec[0]);

-                       putfile();
+                       putfile(1);

                        exit(0);
                }
                close(pvec[1]);
                        exit(0);
                }
                close(pvec[1]);


@@ -267,6 +267,10 @@ filter(mode)
                if(FIXUNDO)
                        undap1 = undap2 = addr2+1;
                ignore(append(getfile, addr2));
                if(FIXUNDO)
                        undap1 = undap2 = addr2+1;
                ignore(append(getfile, addr2));

+#ifdef TRACE
+               if (trace)
+                       vudump("after append in filter");
+#endif

        }
        close(io);
        io = -1;
        }
        close(io);
        io = -1;