Fossil SCM

Fix an apparent bug in the "fossil grep" command causing it to miss the first character of each line.

drh 2019-07-08 17:11 trunk
Commit 5421caa21aa83033a6101cf0b6d81d0ae6fa56c2917e5413303dd8d3ce152659
1 file changed -1
--- src/regexp.c
+++ src/regexp.c
@@ -733,11 +733,10 @@
733733
){
734734
int i, j, n, ln, cnt;
735735
for(i=j=ln=cnt=0; z[i]; i=j+1){
736736
for(j=i; z[j] && z[j]!='\n'; j++){}
737737
n = j - i;
738
- if( z[j]=='\n' ) j++;
739738
ln++;
740739
if( re_match(pRe, (const unsigned char*)(z+i), j-i) ){
741740
cnt++;
742741
if( flags & GREP_EXISTS ){
743742
fossil_print("%s\n", zName);
744743
--- src/regexp.c
+++ src/regexp.c
@@ -733,11 +733,10 @@
733 ){
734 int i, j, n, ln, cnt;
735 for(i=j=ln=cnt=0; z[i]; i=j+1){
736 for(j=i; z[j] && z[j]!='\n'; j++){}
737 n = j - i;
738 if( z[j]=='\n' ) j++;
739 ln++;
740 if( re_match(pRe, (const unsigned char*)(z+i), j-i) ){
741 cnt++;
742 if( flags & GREP_EXISTS ){
743 fossil_print("%s\n", zName);
744
--- src/regexp.c
+++ src/regexp.c
@@ -733,11 +733,10 @@
733 ){
734 int i, j, n, ln, cnt;
735 for(i=j=ln=cnt=0; z[i]; i=j+1){
736 for(j=i; z[j] && z[j]!='\n'; j++){}
737 n = j - i;
 
738 ln++;
739 if( re_match(pRe, (const unsigned char*)(z+i), j-i) ){
740 cnt++;
741 if( flags & GREP_EXISTS ){
742 fossil_print("%s\n", zName);
743

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button