Browse Source

Plan 9 from Bell Labs 2003-07-14

David du Colombier 18 years ago
parent
commit
c8a789b250
4 changed files with 10 additions and 7 deletions
  1. 3 3
      dist/replica/plan9.db
  2. 3 0
      dist/replica/plan9.log
  3. 2 2
      sys/src/libregexp/regexec.c
  4. 2 2
      sys/src/libregexp/rregexec.c

+ 3 - 3
dist/replica/plan9.db

@@ -511,7 +511,7 @@
 386/lib/libmp.a - 664 sys sys 1056364453 77924
 386/lib/libndb.a - 664 sys sys 1056364453 52836
 386/lib/libplumb.a - 664 sys sys 1045538125 19000
-386/lib/libregexp.a - 664 sys sys 1045538126 37356
+386/lib/libregexp.a - 664 sys sys 1058129072 37616
 386/lib/libscribble.a - 664 sys sys 1056364454 108138
 386/lib/libsec.a - 664 sys sys 1057955526 644080
 386/lib/libstdio.a - 664 sys sys 1056364455 128500
@@ -11694,9 +11694,9 @@ sys/src/libregexp/regaux.c - 664 sys sys 944961751 2069
 sys/src/libregexp/regcomp.c - 664 sys sys 944961751 9572
 sys/src/libregexp/regcomp.h - 664 sys sys 1041196492 1986
 sys/src/libregexp/regerror.c - 664 sys sys 944961751 210
-sys/src/libregexp/regexec.c - 664 sys sys 944961751 4945
+sys/src/libregexp/regexec.c - 664 sys sys 1058129054 4975
 sys/src/libregexp/regsub.c - 664 sys sys 988225293 1133
-sys/src/libregexp/rregexec.c - 664 sys sys 944961751 4639
+sys/src/libregexp/rregexec.c - 664 sys sys 1058129062 4671
 sys/src/libregexp/rregsub.c - 664 sys sys 988225293 1156
 sys/src/libscribble - 20000000775 sys sys 985636319 0
 sys/src/libscribble/graffiti.c - 664 sys sys 1014930922 7336

+ 3 - 0
dist/replica/plan9.log

@@ -12833,3 +12833,6 @@
 1057957321 6 c 386/bin/auth/rsafill - 775 sys sys 1057955567 142267
 1057957321 7 c 386/bin/auth/rsagen - 775 sys sys 1057955567 152977
 1058013103 0 c sys/man/8/pop3 - 664 sys sys 1058012143 2444
+1058130077 0 c 386/lib/libregexp.a - 664 sys sys 1058129072 37616
+1058130077 1 c sys/src/libregexp/regexec.c - 664 sys sys 1058129054 4975
+1058130077 2 c sys/src/libregexp/rregexec.c - 664 sys sys 1058129062 4671

+ 2 - 2
sys/src/libregexp/regexec.c

@@ -49,7 +49,7 @@ regexec1(Reprog *progp,	/* program to run */
 			switch(j->starttype) {
 			case RUNE:
 				p = utfrune(s, j->startchar);
-				if(p == 0)
+				if(p == 0 || s == j->eol)
 					return match;
 				s = p;
 				break;
@@ -57,7 +57,7 @@ regexec1(Reprog *progp,	/* program to run */
 				if(s == bol)
 					break;
 				p = utfrune(s, '\n');
-				if(p == 0)
+				if(p == 0 || s == j->eol)
 					return match;
 				s = p;
 				break;

+ 2 - 2
sys/src/libregexp/rregexec.c

@@ -46,7 +46,7 @@ rregexec1(Reprog *progp,	/* program to run */
 			switch(j->starttype) {
 			case RUNE:
 				while(*s != j->startchar) {
-					if(*s == 0)
+					if(*s == 0 || s == j->reol)
 						return match;
 					s++;
 				}
@@ -55,7 +55,7 @@ rregexec1(Reprog *progp,	/* program to run */
 				if(s == bol)
 					break;
 				while(*s != '\n') {
-					if(*s == 0)
+					if(*s == 0 || s == j->reol)
 						return match;
 					s++;
 				}