Fossil SCM

strglob -> sqlite3_strglob in a few places

jan.nijtmans 2014-08-27 15:15 UTC trunk
Commit d4acf5c450101f5993fbf4007399b5dcc2e48b03
Parent ce7df88f6d311bd…
2 files changed +5 -5 +4 -4
~ src/info.c ~ src/main.c
M src/info.c
+5 -5
--- src/info.c
+++ src/info.c
@@ -197,11 +197,11 @@
197197
 i64 fsize;
198198
 int verboseFlag = find_option("verbose","v",0)!=0;
199199
 if( !verboseFlag ){
200200
 verboseFlag = find_option("detail","l",0)!=0; /* deprecated */
201201
 }
202
-
202
+
203203
 /* We should be done with options.. */
204204
 verify_all_options();
205205
206206
 if( g.argc==3 && (fsize = file_size(g.argv[2]))>0 && (fsize&0x1ff)==0 ){
207207
 db_open_config(0);
@@ -1065,28 +1065,28 @@
10651065
 cmp = -1;
10661066
 }else{
10671067
 cmp = fossil_strcmp(pFileFrom->zName, pFileTo->zName);
10681068
 }
10691069
 if( cmp<0 ){
1070
- if(!zGlob || strglob(zGlob, pFileFrom->zName)){
1070
+ if( !zGlob || sqlite3_strglob(zGlob, pFileFrom->zName)==0 ){
10711071
 append_file_change_line(pFileFrom->zName,
10721072
 pFileFrom->zUuid, 0, 0, diffFlags, pRe, 0);
10731073
 }
10741074
 pFileFrom = manifest_file_next(pFrom, 0);
10751075
 }else if( cmp>0 ){
1076
- if(!zGlob || strglob(zGlob, pFileTo->zName)){
1076
+ if( !zGlob || sqlite3_strglob(zGlob, pFileTo->zName)==0 ){
10771077
 append_file_change_line(pFileTo->zName,
10781078
 0, pFileTo->zUuid, 0, diffFlags, pRe,
10791079
 manifest_file_mperm(pFileTo));
10801080
 }
10811081
 pFileTo = manifest_file_next(pTo, 0);
10821082
 }else if( fossil_strcmp(pFileFrom->zUuid, pFileTo->zUuid)==0 ){
10831083
 pFileFrom = manifest_file_next(pFrom, 0);
10841084
 pFileTo = manifest_file_next(pTo, 0);
10851085
 }else{
1086
- if(!zGlob || (strglob(zGlob, pFileFrom->zName)
1087
- || strglob(zGlob, pFileTo->zName))){
1086
+ if(!zGlob || (sqlite3_strglob(zGlob, pFileFrom->zName)==0
1087
+ || sqlite3_strglob(zGlob, pFileTo->zName)==0) ){
10881088
 append_file_change_line(pFileFrom->zName,
10891089
 pFileFrom->zUuid,
10901090
 pFileTo->zUuid, 0, diffFlags, pRe,
10911091
 manifest_file_mperm(pFileTo));
10921092
 }
10931093
--- src/info.c
+++ src/info.c
@@ -197,11 +197,11 @@
197 i64 fsize;
198 int verboseFlag = find_option("verbose","v",0)!=0;
199 if( !verboseFlag ){
200 verboseFlag = find_option("detail","l",0)!=0; /* deprecated */
201 }
202
203 /* We should be done with options.. */
204 verify_all_options();
205
206 if( g.argc==3 && (fsize = file_size(g.argv[2]))>0 && (fsize&0x1ff)==0 ){
207 db_open_config(0);
@@ -1065,28 +1065,28 @@
1065 cmp = -1;
1066 }else{
1067 cmp = fossil_strcmp(pFileFrom->zName, pFileTo->zName);
1068 }
1069 if( cmp<0 ){
1070 if(!zGlob || strglob(zGlob, pFileFrom->zName)){
1071 append_file_change_line(pFileFrom->zName,
1072 pFileFrom->zUuid, 0, 0, diffFlags, pRe, 0);
1073 }
1074 pFileFrom = manifest_file_next(pFrom, 0);
1075 }else if( cmp>0 ){
1076 if(!zGlob || strglob(zGlob, pFileTo->zName)){
1077 append_file_change_line(pFileTo->zName,
1078 0, pFileTo->zUuid, 0, diffFlags, pRe,
1079 manifest_file_mperm(pFileTo));
1080 }
1081 pFileTo = manifest_file_next(pTo, 0);
1082 }else if( fossil_strcmp(pFileFrom->zUuid, pFileTo->zUuid)==0 ){
1083 pFileFrom = manifest_file_next(pFrom, 0);
1084 pFileTo = manifest_file_next(pTo, 0);
1085 }else{
1086 if(!zGlob || (strglob(zGlob, pFileFrom->zName)
1087 || strglob(zGlob, pFileTo->zName))){
1088 append_file_change_line(pFileFrom->zName,
1089 pFileFrom->zUuid,
1090 pFileTo->zUuid, 0, diffFlags, pRe,
1091 manifest_file_mperm(pFileTo));
1092 }
1093
--- src/info.c
+++ src/info.c
@@ -197,11 +197,11 @@
197 i64 fsize;
198 int verboseFlag = find_option("verbose","v",0)!=0;
199 if( !verboseFlag ){
200 verboseFlag = find_option("detail","l",0)!=0; /* deprecated */
201 }
202
203 /* We should be done with options.. */
204 verify_all_options();
205
206 if( g.argc==3 && (fsize = file_size(g.argv[2]))>0 && (fsize&0x1ff)==0 ){
207 db_open_config(0);
@@ -1065,28 +1065,28 @@
1065 cmp = -1;
1066 }else{
1067 cmp = fossil_strcmp(pFileFrom->zName, pFileTo->zName);
1068 }
1069 if( cmp<0 ){
1070 if( !zGlob || sqlite3_strglob(zGlob, pFileFrom->zName)==0 ){
1071 append_file_change_line(pFileFrom->zName,
1072 pFileFrom->zUuid, 0, 0, diffFlags, pRe, 0);
1073 }
1074 pFileFrom = manifest_file_next(pFrom, 0);
1075 }else if( cmp>0 ){
1076 if( !zGlob || sqlite3_strglob(zGlob, pFileTo->zName)==0 ){
1077 append_file_change_line(pFileTo->zName,
1078 0, pFileTo->zUuid, 0, diffFlags, pRe,
1079 manifest_file_mperm(pFileTo));
1080 }
1081 pFileTo = manifest_file_next(pTo, 0);
1082 }else if( fossil_strcmp(pFileFrom->zUuid, pFileTo->zUuid)==0 ){
1083 pFileFrom = manifest_file_next(pFrom, 0);
1084 pFileTo = manifest_file_next(pTo, 0);
1085 }else{
1086 if(!zGlob || (sqlite3_strglob(zGlob, pFileFrom->zName)==0
1087 || sqlite3_strglob(zGlob, pFileTo->zName)==0) ){
1088 append_file_change_line(pFileFrom->zName,
1089 pFileFrom->zUuid,
1090 pFileTo->zUuid, 0, diffFlags, pRe,
1091 manifest_file_mperm(pFileTo));
1092 }
1093
M src/main.c
+4 -4
--- src/main.c
+++ src/main.c
@@ -940,11 +940,11 @@
940940
 void version_cmd(void){
941941
 int verboseFlag = 0;
942942
943943
 fossil_print("This is fossil version %s\n", get_version());
944944
 verboseFlag = find_option("verbose","v",0)!=0;
945
-
945
+
946946
 /* We should be done with options.. */
947947
 verify_all_options();
948948
949949
 if(!verboseFlag){
950950
 return;
@@ -1429,11 +1429,11 @@
14291429
 continue;
14301430
 }
14311431
 if( pFileGlob!=0
14321432
 && file_isfile(zRepo)
14331433
 && glob_match(pFileGlob, zRepo)
1434
- && strglob("*.fossil*",zRepo)==0
1434
+ && sqlite3_strglob("*.fossil*",zRepo)!=0
14351435
 && (zMimetype = mimetype_from_name(zRepo))!=0
14361436
 && strcmp(zMimetype, "application/x-fossil-artifact")!=0
14371437
 ){
14381438
 Blob content;
14391439
 blob_read_from_file(&content, zRepo);
@@ -1935,11 +1935,11 @@
19351935
 if( zAltBase ) set_base_url(zAltBase);
19361936
 if( find_option("https",0,0)!=0 ) cgi_replace_parameter("HTTPS","on");
19371937
 zHost = find_option("host", 0, 1);
19381938
 if( zHost ) cgi_replace_parameter("HTTP_HOST",zHost);
19391939
 g.cgiOutput = 1;
1940
-
1940
+
19411941
 /* We should be done with options.. */
19421942
 verify_all_options();
19431943
19441944
 if( g.argc!=2 && g.argc!=3 && g.argc!=6 ){
19451945
 fossil_fatal("no repository specified");
@@ -2125,11 +2125,11 @@
21252125
 set_base_url(zAltBase);
21262126
 }
21272127
 if( find_option("localhost", 0, 0)!=0 ){
21282128
 flags |= HTTP_SERVER_LOCALHOST;
21292129
 }
2130
-
2130
+
21312131
 /* We should be done with options.. */
21322132
 verify_all_options();
21332133
21342134
 if( g.argc!=2 && g.argc!=3 ) usage("?REPOSITORY?");
21352135
 isUiCmd = g.argv[1][0]=='u';
21362136
--- src/main.c
+++ src/main.c
@@ -940,11 +940,11 @@
940 void version_cmd(void){
941 int verboseFlag = 0;
942
943 fossil_print("This is fossil version %s\n", get_version());
944 verboseFlag = find_option("verbose","v",0)!=0;
945
946 /* We should be done with options.. */
947 verify_all_options();
948
949 if(!verboseFlag){
950 return;
@@ -1429,11 +1429,11 @@
1429 continue;
1430 }
1431 if( pFileGlob!=0
1432 && file_isfile(zRepo)
1433 && glob_match(pFileGlob, zRepo)
1434 && strglob("*.fossil*",zRepo)==0
1435 && (zMimetype = mimetype_from_name(zRepo))!=0
1436 && strcmp(zMimetype, "application/x-fossil-artifact")!=0
1437 ){
1438 Blob content;
1439 blob_read_from_file(&content, zRepo);
@@ -1935,11 +1935,11 @@
1935 if( zAltBase ) set_base_url(zAltBase);
1936 if( find_option("https",0,0)!=0 ) cgi_replace_parameter("HTTPS","on");
1937 zHost = find_option("host", 0, 1);
1938 if( zHost ) cgi_replace_parameter("HTTP_HOST",zHost);
1939 g.cgiOutput = 1;
1940
1941 /* We should be done with options.. */
1942 verify_all_options();
1943
1944 if( g.argc!=2 && g.argc!=3 && g.argc!=6 ){
1945 fossil_fatal("no repository specified");
@@ -2125,11 +2125,11 @@
2125 set_base_url(zAltBase);
2126 }
2127 if( find_option("localhost", 0, 0)!=0 ){
2128 flags |= HTTP_SERVER_LOCALHOST;
2129 }
2130
2131 /* We should be done with options.. */
2132 verify_all_options();
2133
2134 if( g.argc!=2 && g.argc!=3 ) usage("?REPOSITORY?");
2135 isUiCmd = g.argv[1][0]=='u';
2136
--- src/main.c
+++ src/main.c
@@ -940,11 +940,11 @@
940 void version_cmd(void){
941 int verboseFlag = 0;
942
943 fossil_print("This is fossil version %s\n", get_version());
944 verboseFlag = find_option("verbose","v",0)!=0;
945
946 /* We should be done with options.. */
947 verify_all_options();
948
949 if(!verboseFlag){
950 return;
@@ -1429,11 +1429,11 @@
1429 continue;
1430 }
1431 if( pFileGlob!=0
1432 && file_isfile(zRepo)
1433 && glob_match(pFileGlob, zRepo)
1434 && sqlite3_strglob("*.fossil*",zRepo)!=0
1435 && (zMimetype = mimetype_from_name(zRepo))!=0
1436 && strcmp(zMimetype, "application/x-fossil-artifact")!=0
1437 ){
1438 Blob content;
1439 blob_read_from_file(&content, zRepo);
@@ -1935,11 +1935,11 @@
1935 if( zAltBase ) set_base_url(zAltBase);
1936 if( find_option("https",0,0)!=0 ) cgi_replace_parameter("HTTPS","on");
1937 zHost = find_option("host", 0, 1);
1938 if( zHost ) cgi_replace_parameter("HTTP_HOST",zHost);
1939 g.cgiOutput = 1;
1940
1941 /* We should be done with options.. */
1942 verify_all_options();
1943
1944 if( g.argc!=2 && g.argc!=3 && g.argc!=6 ){
1945 fossil_fatal("no repository specified");
@@ -2125,11 +2125,11 @@
2125 set_base_url(zAltBase);
2126 }
2127 if( find_option("localhost", 0, 0)!=0 ){
2128 flags |= HTTP_SERVER_LOCALHOST;
2129 }
2130
2131 /* We should be done with options.. */
2132 verify_all_options();
2133
2134 if( g.argc!=2 && g.argc!=3 ) usage("?REPOSITORY?");
2135 isUiCmd = g.argv[1][0]=='u';
2136

Keyboard Shortcuts

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