release 3.2, Jan 4, 1980

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

diff --git a/usr/src/usr.bin/ex/ex_subr.c b/usr/src/usr.bin/ex/ex_subr.c
index a5ccf85..1e17f4c 100644 (file)
--- a/usr/src/usr.bin/ex/ex_subr.c
+++ b/usr/src/usr.bin/ex/ex_subr.c
@@ -316,10 +316,14 @@ mesg(str)
 
 /*VARARGS2*/
 merror(seekpt, i)
 
 /*VARARGS2*/
 merror(seekpt, i)

-#ifdef lint
+#ifdef VMUNIX

        char *seekpt;
 #else
        char *seekpt;
 #else

+# ifdef lint
+       char *seekpt;
+# else

        int seekpt;
        int seekpt;

+# endif

 #endif
        int i;
 {
 #endif
        int i;
 {


@@ -340,16 +344,24 @@ merror(seekpt, i)
 }
 
 merror1(seekpt)
 }
 
 merror1(seekpt)

-#ifdef lint
+#ifdef VMUNIX

        char *seekpt;
 #else
        char *seekpt;
 #else

+# ifdef lint
+       char *seekpt;
+# else

        int seekpt;
        int seekpt;

+# endif

 #endif
 {
 
 #endif
 {
 

+#ifdef VMUNIX
+       strcpy(linebuf, seekpt);
+#else

        lseek(erfile, (long) seekpt, 0);
        if (read(erfile, linebuf, 128) < 2)
                CP(linebuf, "ERROR");
        lseek(erfile, (long) seekpt, 0);
        if (read(erfile, linebuf, 128) < 2)
                CP(linebuf, "ERROR");

+#endif

 }
 
 morelines()
 }
 
 morelines()


@@ -584,7 +596,11 @@ smerror(seekpt, cp)
 #ifdef lint
 char   *std_errlist[] = {
 #else
 #ifdef lint
 char   *std_errlist[] = {
 #else

+#ifdef VMUNIX
+char   *std_errlist[] = {
+#else

 short  std_errlist[] = {
 short  std_errlist[] = {

+#endif

 #endif
        error("Error 0"),
        error("Not super-user"),
 #endif
        error("Error 0"),
        error("Not super-user"),