projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sun version and make install fixes
[unix-history]
/
usr
/
src
/
usr.bin
/
ex
/
ex_re.c
diff --git
a/usr/src/usr.bin/ex/ex_re.c
b/usr/src/usr.bin/ex/ex_re.c
index
c9c433a
..
f55e870
100644
(file)
--- a/
usr/src/usr.bin/ex/ex_re.c
+++ b/
usr/src/usr.bin/ex/ex_re.c
@@
-1,5
+1,5
@@
-/* Copyright (c) 198
0
Regents of the University of California */
-static char *sccsid = "@(#)ex_re.c
6.2
%G%";
+/* Copyright (c) 198
1
Regents of the University of California */
+static char *sccsid = "@(#)ex_re.c
7.2
%G%";
#include "ex.h"
#include "ex_re.h"
#include "ex.h"
#include "ex_re.h"
@@
-166,7
+166,7
@@
substitute(c)
{
register line *addr;
register int n;
{
register line *addr;
register int n;
- int gsubf, hopcount
= 0
;
+ int gsubf, hopcount;
gsubf = compsub(c);
if(FIXUNDO)
gsubf = compsub(c);
if(FIXUNDO)
@@
-174,7
+174,7
@@
substitute(c)
stotal = 0;
slines = 0;
for (addr = addr1; addr <= addr2; addr++) {
stotal = 0;
slines = 0;
for (addr = addr1; addr <= addr2; addr++) {
- scount = 0;
+ scount =
hopcount =
0;
if (dosubcon(0, addr) == 0)
continue;
if (gsubf) {
if (dosubcon(0, addr) == 0)
continue;
if (gsubf) {
@@
-423,6
+423,10
@@
dosub()
*sp++ = *lp++;
casecnt = 0;
while (c = *rp++) {
*sp++ = *lp++;
casecnt = 0;
while (c = *rp++) {
+ /* ^V <return> from vi to split lines */
+ if (c == '\r')
+ c = '\n';
+
if (c & QUOTE)
switch (c & TRIM) {
if (c & QUOTE)
switch (c & TRIM) {