Another attempt at generalizing the URI parsing so that it works with a

wider variety of file URIs and yet remains backwards compatible.

FossilOrigin-Name: de05eb75ecfd208846d583c82ec05c5c5ef7e8ce

diff --git a/manifest b/manifest
index 156319adc0f7f1dd8e2919a56c067b6f1faff9e4..03f3822c2b85a7fc1d192894bb8d24f5dc73ffb2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\s'queryplantest'\starget\sto\sthe\sMSVC\smakefile.
-D 2013-07-20T00:34:31.920
+C Another\sattempt\sat\sgeneralizing\sthe\sURI\sparsing\sso\sthat\sit\sworks\swith\sa\nwider\svariety\sof\sfile\sURIs\sand\syet\sremains\sbackwards\scompatible.
+D 2013-07-24T14:54:35.099
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -185,7 +185,7 @@ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
 F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
 F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
-F src/main.c e5810b2d7a0bd19f3d75ce60e3ed918cafc0a3f3
+F src/main.c a7efdff1516d77dcee9877dcf75fb5fa4ceaf3ea
 F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@ -435,7 +435,7 @@ F test/e_resolve.test dcce9308fb13b934ce29591105d031d3e14fbba6
 F test/e_select.test d5af998a402740d8f0488158d22075df2b6f88fa
 F test/e_select2.test 5c3d3da19c7b3e90ae444579db2b70098599ab92
 F test/e_update.test 161d5dc6a3ed9dd08f5264d13e20735d7a89f00c
-F test/e_uri.test 8f2f56b29456a3f846276fa4e0993d4ef8a15b79
+F test/e_uri.test cf5cf9a6f1e0f690ee6a2ee7a12d077ddccbeb0c
 F test/e_vacuum.test 331da289ae186656cf5f2eb27f577a89c0c221af
 F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
 F test/enc2.test 83437a79ba1545a55fb549309175c683fb334473
@@ -984,7 +984,7 @@ F test/unique.test cadb172bbd5a2e83cd644d186ccd602085e54edc
 F test/unixexcl.test a9870e46cc6f8390a494513d4f2bf55b5a8b3e46
 F test/unordered.test ef85ac8f2f3c93ed2b9e811b684de73175fc464c
 F test/update.test 8bc86fd7ef1a00014f76dc6a6a7c974df4aef172
-F test/uri.test 63e03df051620a18f794b4f4adcdefb3c23b6751
+F test/uri.test 4a6fee19bfe8a65a6d273032aa4fc842535b46b7
 F test/utf16align.test 54cd35a27c005a9b6e7815d887718780b6a462ae
 F test/vacuum.test ce91c39f7f91a4273bf620efad21086b5aa6ef1d
 F test/vacuum2.test af432e6e3bfc0ea20a80cb86a03c7d9876d38324
@@ -1103,7 +1103,10 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P f755b4b21c885f3e897c2a79fc7ac1220210e653
-R c94bb34849c12b79ab21d48a7e4bfef4
-U mistachkin
-Z e904e41c59c0106f85082fb614ea3828
+P ad0551e039ccaa9e7a28682b756b56ac2b8fef0d
+R a3b3b6e5ecdb948d76f9eeff9500d7ff
+T *branch * uri-enhancement
+T *sym-uri-enhancement *
+T -sym-trunk *
+U drh
+Z a241308738f93f6f0a72323634a4306d

diff --git a/manifest.uuid b/manifest.uuid
index 7a0ddc57b55e7a663bd7c4ddf087999ee0d7e946..ed57efc076293e239edc2c83b760392bdf3e5d0d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ad0551e039ccaa9e7a28682b756b56ac2b8fef0d
\ No newline at end of file
+de05eb75ecfd208846d583c82ec05c5c5ef7e8ce
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index c23a6212d3d62d67e7f8d851602e582fb36b148f..1dc63c4a23cba72e9033c10c8895f9d97f40f1c1 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2177,19 +2177,29 @@ int sqlite3ParseUri(
     zFile = sqlite3_malloc(nByte);
     if( !zFile ) return SQLITE_NOMEM;
 
-    /* Discard the scheme and authority segments of the URI. */
-    if( zUri[5]=='/' && zUri[6]=='/' ){
+    /* Mappings:
+    ** URI                            FILENAME
+    ** ---------------------------    ----------------------
+    ** file:abc/xyz                   abc/xyz
+    ** file:/abc/xyz                  /abc/xyz
+    ** file://abc/xyz                 //abc/xyz
+    ** file:///abc/xyz                /abc/xyz
+    ** file:////abc/xyz               //abc/xyz
+    ** file://///abc/xyz              //abc/xyz
+    ** file://localhost/xyz           /xyz
+    ** file:///c:/abc/xyz             /c:/abc/xyz    (winOpen() removes leading /)
+    */
+    iIn = 5;
+    if( strncmp(zUri+5, "///", 3)==0 ){
       iIn = 7;
-      while( zUri[iIn] && zUri[iIn]!='/' ) iIn++;
-
-      if( iIn!=7 && (iIn!=16 || memcmp("localhost", &zUri[7], 9)) ){
-        *pzErrMsg = sqlite3_mprintf("invalid uri authority: %.*s", 
-            iIn-7, &zUri[7]);
-        rc = SQLITE_ERROR;
-        goto parse_uri_out;
-      }
-    }else{
-      iIn = 5;
+      /* The following condition causes URIs with five leading / characters
+      ** like file://///host/path to be converted into UNCs like //host/path.
+      ** The correct URI for that UNC has only two or four leading / characters
+      ** file://host/path or file:////host/path.  But 5 leading slashes is a 
+      ** common error, we are told, so we handle it as a special case. */
+      if( strncmp(zUri+7, "///", 3)==0 ){ iIn++; }
+    }else if( strncmp(zUri+5, "//localhost/", 12)==0 ){
+      iIn = 16;
     }
 
     /* Copy the filename and any query parameters into the zFile buffer. 

diff --git a/test/e_uri.test b/test/e_uri.test
index ac34ed49aa4b7e394e5b8d61dfa86a619181bd25..225c98dc5bef1d2de43a8cc77356a95eff465c6f 100644 (file)
--- a/test/e_uri.test
+++ b/test/e_uri.test
@@ -133,8 +133,6 @@ if {$tcl_platform(platform) == "unix"} {
   foreach {tn uri error} "
     1  {file://localhost[test_pwd /]test.db}   {not an error}
     2  {file://[test_pwd /]test.db}            {not an error}
-    3  {file://x[test_pwd /]test.db}           {invalid uri authority: x}
-    4  {file://invalid[test_pwd /]test.db}     {invalid uri authority: invalid}
   " {
     do_test 2.$tn {
       set DB [sqlite3_open_v2 $uri $flags ""]

diff --git a/test/uri.test b/test/uri.test
index af1ad672508744d55b8ae73011224bfc7f2696c2..a5b7bd767d9fe8d27bcf2d2dec7b35b925d003be 100644 (file)
--- a/test/uri.test
+++ b/test/uri.test
@@ -281,9 +281,6 @@ foreach {tn uri res} {
   1     "file://localhost/PWD/test.db"   {not an error}
   2     "file:///PWD/test.db"            {not an error}
   3     "file:/PWD/test.db"              {not an error}
-  4     "file://l%6Fcalhost/PWD/test.db" {invalid uri authority: l%6Fcalhost}
-  5     "file://lbcalhost/PWD/test.db"   {invalid uri authority: lbcalhost}
-  6     "file://x/PWD/test.db"           {invalid uri authority: x}
 } {
 
   if {$tcl_platform(platform)=="windows"} {