Fossil SCM
Proposed fix for [ed23ef59cf]: Fossil ignoring "binary-glob" setting
Commit
e0e88821bda945bc70832b9e16e697f159efc93a
Parent
ab2920c2b9478b4…
1 file changed
+1
-1
+1
-1
| --- src/glob.c | ||
| +++ src/glob.c | ||
| @@ -54,11 +54,11 @@ | ||
| 54 | 54 | cTerm = zGlobList[0]; |
| 55 | 55 | zGlobList++; |
| 56 | 56 | }else{ |
| 57 | 57 | cTerm = ','; |
| 58 | 58 | } |
| 59 | - for(i=0; zGlobList[i] && zGlobList[i]!=cTerm; i++){} | |
| 59 | + for(i=0; zGlobList[i] && zGlobList[i]!=cTerm && zGlobList[i]!='\n'; i++){} | |
| 60 | 60 | if( cTerm==',' ){ |
| 61 | 61 | while( i>0 && fossil_isspace(zGlobList[i-1]) ){ i--; } |
| 62 | 62 | } |
| 63 | 63 | blob_appendf(&expr, "%s%s GLOB '%#q'", zSep, zVal, i, zGlobList); |
| 64 | 64 | zSep = " OR "; |
| 65 | 65 |
| --- src/glob.c | |
| +++ src/glob.c | |
| @@ -54,11 +54,11 @@ | |
| 54 | cTerm = zGlobList[0]; |
| 55 | zGlobList++; |
| 56 | }else{ |
| 57 | cTerm = ','; |
| 58 | } |
| 59 | for(i=0; zGlobList[i] && zGlobList[i]!=cTerm; i++){} |
| 60 | if( cTerm==',' ){ |
| 61 | while( i>0 && fossil_isspace(zGlobList[i-1]) ){ i--; } |
| 62 | } |
| 63 | blob_appendf(&expr, "%s%s GLOB '%#q'", zSep, zVal, i, zGlobList); |
| 64 | zSep = " OR "; |
| 65 |
| --- src/glob.c | |
| +++ src/glob.c | |
| @@ -54,11 +54,11 @@ | |
| 54 | cTerm = zGlobList[0]; |
| 55 | zGlobList++; |
| 56 | }else{ |
| 57 | cTerm = ','; |
| 58 | } |
| 59 | for(i=0; zGlobList[i] && zGlobList[i]!=cTerm && zGlobList[i]!='\n'; i++){} |
| 60 | if( cTerm==',' ){ |
| 61 | while( i>0 && fossil_isspace(zGlobList[i-1]) ){ i--; } |
| 62 | } |
| 63 | blob_appendf(&expr, "%s%s GLOB '%#q'", zSep, zVal, i, zGlobList); |
| 64 | zSep = " OR "; |
| 65 |