now makes the temporary editing file mode 0400 if in readonly

[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 babd233..93dea19 100644 (file)
--- a/usr/src/usr.bin/ex/ex_subr.c
+++ b/usr/src/usr.bin/ex/ex_subr.c
@@ -1,4 +1,5 @@
-/* Copyright (c) 1979 Regents of the University of California */
+/* Copyright (c) 1980 Regents of the University of California */
+static char *sccsid = "@(#)ex_subr.c   5.1 %G%";

 #include "ex.h"
 #include "ex_re.h"
 #include "ex_tty.h"
 #include "ex.h"
 #include "ex_re.h"
 #include "ex_tty.h"


@@ -56,6 +57,21 @@ column(cp)
        return (qcolumn(cp, (char *) 0));
 }
 
        return (qcolumn(cp, (char *) 0));
 }
 

+/*
+ * Ignore a comment to the end of the line.
+ * This routine eats the trailing newline so don't call newline().
+ */
+comment()
+{
+       register int c;
+
+       do {
+               c = getchar();
+       } while (c != '\n' && c != EOF);
+       if (c == EOF)
+               ungetchar(c);
+}
+

 Copy(to, from, size)
        register char *from, *to;
        register int size;
 Copy(to, from, size)
        register char *from, *to;
        register int size;


@@ -179,6 +195,8 @@ ignnEOF()
 
        if (c == EOF)
                ungetchar(c);
 
        if (c == EOF)
                ungetchar(c);

+       else if (c=='"')
+               comment();

 }
 
 iswhite(c)
 }
 
 iswhite(c)


@@ -437,13 +455,15 @@ putmk1(addr, n)
        int n;
 {
        register line *markp;
        int n;
 {
        register line *markp;

+       register oldglobmk;

 
 

+       oldglobmk = *addr & 1;

        *addr &= ~1;
        for (markp = (anymarks ? names : &names['z'-'a'+1]);
          markp <= &names['z'-'a'+1]; markp++)
                if (*markp == *addr)
                        *markp = n;
        *addr &= ~1;
        for (markp = (anymarks ? names : &names['z'-'a'+1]);
          markp <= &names['z'-'a'+1]; markp++)
                if (*markp == *addr)
                        *markp = n;

-       *addr = n;
+       *addr = n | oldglobmk;

 }
 
 char *
 }
 
 char *


@@ -684,6 +704,25 @@ syserror()
                error("System error %d", e);
 }
 
                error("System error %d", e);
 }
 

+/*
+ * Return the column number that results from being in column col and
+ * hitting a tab, where tabs are set every ts columns.  Work right for
+ * the case where col > COLUMNS, even if ts does not divide COLUMNS.
+ */
+tabcol(col, ts)
+int col, ts;
+{
+       int offset, result;
+
+       if (col >= COLUMNS) {
+               offset = COLUMNS * (col/COLUMNS);
+               col -= offset;
+       } else
+               offset = 0;
+       result = col + ts - (col % ts) + offset;
+       return (result);
+}
+

 char *
 vfindcol(i)
        int i;
 char *
 vfindcol(i)
        int i;


@@ -767,4 +806,3 @@ markit(addr)
        if (addr != dot && addr >= one && addr <= dol)
                markDOT();
 }
        if (addr != dot && addr >= one && addr <= dol)
                markDOT();
 }

-