date and time created 83/02/11 15:45:08 by rrh

[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 a6754e8..4cc4e30 100644 (file)
--- a/usr/src/usr.bin/ex/ex_io.c
+++ b/usr/src/usr.bin/ex/ex_io.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 1981 Regents of the University of California */
 /* Copyright (c) 1981 Regents of the University of California */

-static char *sccsid = "@(#)ex_io.c     7.1     %G%";
+static char *sccsid = "@(#)ex_io.c     7.4     %G%";

 #include "ex.h"
 #include "ex_argv.h"
 #include "ex_temp.h"
 #include "ex.h"
 #include "ex_argv.h"
 #include "ex_temp.h"


@@ -277,10 +277,10 @@ gscan()
 /*
  * Parse one filename into file.
  */
 /*
  * Parse one filename into file.
  */

+struct glob G;

 getone()
 {
        register char *str;
 getone()
 {
        register char *str;

-       struct glob G;

 
        if (getargs() == 0)
                error("Missing filename");
 
        if (getargs() == 0)
                error("Missing filename");


@@ -374,7 +374,13 @@ rop(c)
                        error(" Archive");
 
                default:
                        error(" Archive");
 
                default:

+#ifdef mbb
+                       /* C/70 has a 10 bit byte */
+                       if (magic & 03401600)
+#else
+                       /* Everybody else has an 8 bit byte */

                        if (magic & 0100200)
                        if (magic & 0100200)

+#endif

                                error(" Non-ascii file");
                        break;
                }
                                error(" Non-ascii file");
                        break;
                }


@@ -614,7 +620,7 @@ edfile()
 /*
  * Extract the next line from the io stream.
  */
 /*
  * Extract the next line from the io stream.
  */

-static char *nextip;
+char *nextip;

 
 getfile()
 {
 
 getfile()
 {


@@ -747,7 +753,8 @@ source(fil, okfail)
 {
        jmp_buf osetexit;
        register int saveinp, ointty, oerrno;
 {
        jmp_buf osetexit;
        register int saveinp, ointty, oerrno;

-       char savepeekc, *saveglobp;
+       char *saveglobp;
+       short savepeekc;

 
        signal(SIGINT, SIG_IGN);
        saveinp = dup(0);
 
        signal(SIGINT, SIG_IGN);
        saveinp = dup(0);