release 3.2, Jan 4, 1980

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

diff --git a/usr/src/usr.bin/ex/ex_io.c b/usr/src/usr.bin/ex/ex_io.c
index d89f1ff..d22f82e 100644 (file)
--- a/usr/src/usr.bin/ex/ex_io.c
+++ b/usr/src/usr.bin/ex/ex_io.c
@@ -13,12 +13,16 @@
  * Following remember where . was in the previous file for return
  * on file switching.
  */
  * Following remember where . was in the previous file for return
  * on file switching.
  */

-short  altdot;
-short  oldadot;
+int    altdot;
+int    oldadot;

 bool   wasalt;
 
 long   cntch;                  /* Count of characters on unit io */
 bool   wasalt;
 
 long   cntch;                  /* Count of characters on unit io */

+#ifndef VMUNIX

 short  cntln;                  /* Count of lines " */
 short  cntln;                  /* Count of lines " */

+#else
+int    cntln;
+#endif

 long   cntnull;                /* Count of nulls " */
 long   cntodd;                 /* Count of non-ascii characters " */
 
 long   cntnull;                /* Count of nulls " */
 long   cntodd;                 /* Count of non-ascii characters " */
 


@@ -476,7 +480,9 @@ bool dofname;       /* if 1 call filename, else use savedfile */
                        error(" Use \"w!\" to write partial buffer");
                }
 cre:
                        error(" Use \"w!\" to write partial buffer");
                }
 cre:

+/*

                synctmp();
                synctmp();

+*/

 #ifdef V6
                io = creat(file, 0644);
 #else
 #ifdef V6
                io = creat(file, 0644);
 #else


@@ -689,7 +695,9 @@ unixex(opt, up, newstdin, mode)
                        close(io);
                if (tfile)
                        close(tfile);
                        close(io);
                if (tfile)
                        close(tfile);

+#ifndef VMUNIX

                close(erfile);
                close(erfile);

+#endif

                signal(SIGHUP, oldhup);
                signal(SIGQUIT, oldquit);
                if (ruptible)
                signal(SIGHUP, oldhup);
                signal(SIGQUIT, oldquit);
                if (ruptible)