Fossil SCM
Improvements to the URL-to-repository-filename converter.
Commit
23679d720dc49920abbe8a5ce98ad8af6dd558a4ae17c1447133ab110e46e94d
Parent
8d9ea283732ef8c…
1 file changed
+2
-2
+2
-2
| --- src/url.c | ||
| +++ src/url.c | ||
| @@ -649,15 +649,15 @@ | ||
| 649 | 649 | const char *zTail = 0; |
| 650 | 650 | int i; |
| 651 | 651 | if( zUrl==0 ) return 0; |
| 652 | 652 | for(i=0; zUrl[i]; i++){ |
| 653 | 653 | if( zUrl[i]=='?' ) break; |
| 654 | - if( zUrl[i]=='/' && zUrl[i+1]!=0 ) zTail = &zUrl[i+1]; | |
| 654 | + if( (zUrl[i]=='/' || zUrl[i]=='@') && zUrl[i+1]!=0 ) zTail = &zUrl[i+1]; | |
| 655 | 655 | } |
| 656 | 656 | if( zTail==0 ) return 0; |
| 657 | 657 | if( sqlite3_strnicmp(zTail, "www.", 4)==0 ) zTail += 4; |
| 658 | - if( zTail[i]==0 ) return 0; | |
| 658 | + if( zTail[0]==0 ) return 0; | |
| 659 | 659 | for(i=0; zTail[i] && zTail[i]!='.' && zTail[i]!='?'; i++){} |
| 660 | 660 | if( i==0 ) return 0; |
| 661 | 661 | return mprintf("%.*s", i, zTail); |
| 662 | 662 | } |
| 663 | 663 | |
| 664 | 664 |
| --- src/url.c | |
| +++ src/url.c | |
| @@ -649,15 +649,15 @@ | |
| 649 | const char *zTail = 0; |
| 650 | int i; |
| 651 | if( zUrl==0 ) return 0; |
| 652 | for(i=0; zUrl[i]; i++){ |
| 653 | if( zUrl[i]=='?' ) break; |
| 654 | if( zUrl[i]=='/' && zUrl[i+1]!=0 ) zTail = &zUrl[i+1]; |
| 655 | } |
| 656 | if( zTail==0 ) return 0; |
| 657 | if( sqlite3_strnicmp(zTail, "www.", 4)==0 ) zTail += 4; |
| 658 | if( zTail[i]==0 ) return 0; |
| 659 | for(i=0; zTail[i] && zTail[i]!='.' && zTail[i]!='?'; i++){} |
| 660 | if( i==0 ) return 0; |
| 661 | return mprintf("%.*s", i, zTail); |
| 662 | } |
| 663 | |
| 664 |
| --- src/url.c | |
| +++ src/url.c | |
| @@ -649,15 +649,15 @@ | |
| 649 | const char *zTail = 0; |
| 650 | int i; |
| 651 | if( zUrl==0 ) return 0; |
| 652 | for(i=0; zUrl[i]; i++){ |
| 653 | if( zUrl[i]=='?' ) break; |
| 654 | if( (zUrl[i]=='/' || zUrl[i]=='@') && zUrl[i+1]!=0 ) zTail = &zUrl[i+1]; |
| 655 | } |
| 656 | if( zTail==0 ) return 0; |
| 657 | if( sqlite3_strnicmp(zTail, "www.", 4)==0 ) zTail += 4; |
| 658 | if( zTail[0]==0 ) return 0; |
| 659 | for(i=0; zTail[i] && zTail[i]!='.' && zTail[i]!='?'; i++){} |
| 660 | if( i==0 ) return 0; |
| 661 | return mprintf("%.*s", i, zTail); |
| 662 | } |
| 663 | |
| 664 |