Fossil SCM

Fixed an off-by-one error affecting "fossil grep" when the final argument was left off.

wyoung 2018-10-04 07:13 trunk
Commit f6502e8caec3e7a109dc08f78ccede034520232a21e3963a94c63619a3634bb8
1 file changed +1 -1
+1 -1
--- src/regexp.c
+++ src/regexp.c
@@ -815,11 +815,11 @@
815815
if( find_option("ignore-case","i",0)!=0 ) ignoreCase = 1;
816816
if( find_option("files-with-matches","l",0)!=0 ) flags |= GREP_EXISTS;
817817
if( find_option("verbose","v",0)!=0 ) bVerbose = 1;
818818
db_find_and_open_repository(0, 0);
819819
verify_all_options();
820
- if( g.argc<3 ){
820
+ if( g.argc<4 ){
821821
usage("REGEXP FILENAME");
822822
}
823823
zErr = re_compile(&pRe, g.argv[2], ignoreCase);
824824
if( zErr ) fossil_fatal("%s", zErr);
825825
826826
--- src/regexp.c
+++ src/regexp.c
@@ -815,11 +815,11 @@
815 if( find_option("ignore-case","i",0)!=0 ) ignoreCase = 1;
816 if( find_option("files-with-matches","l",0)!=0 ) flags |= GREP_EXISTS;
817 if( find_option("verbose","v",0)!=0 ) bVerbose = 1;
818 db_find_and_open_repository(0, 0);
819 verify_all_options();
820 if( g.argc<3 ){
821 usage("REGEXP FILENAME");
822 }
823 zErr = re_compile(&pRe, g.argv[2], ignoreCase);
824 if( zErr ) fossil_fatal("%s", zErr);
825
826
--- src/regexp.c
+++ src/regexp.c
@@ -815,11 +815,11 @@
815 if( find_option("ignore-case","i",0)!=0 ) ignoreCase = 1;
816 if( find_option("files-with-matches","l",0)!=0 ) flags |= GREP_EXISTS;
817 if( find_option("verbose","v",0)!=0 ) bVerbose = 1;
818 db_find_and_open_repository(0, 0);
819 verify_all_options();
820 if( g.argc<4 ){
821 usage("REGEXP FILENAME");
822 }
823 zErr = re_compile(&pRe, g.argv[2], ignoreCase);
824 if( zErr ) fossil_fatal("%s", zErr);
825
826

Keyboard Shortcuts

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