Work around win2k problems so that single-character filenames can be

used.  Ticket #2151. (CVS 3582)

FossilOrigin-Name: c4eb2100c39356e1816cc6514d65155e47ea1a1d

diff --git a/manifest b/manifest
index f8665d08297cbb1940b37ab2d91271a5203f86a5..128900972c00fc40a009b9b7058f641931586a31 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Documentation\sand\stests\sto\sshow\sthat\sthe\scause\sof\sa\sparsing\serror\sis\navailable\son\ssqlite3_errmsg\safter\ssqlite3_step\sreturn\sSQLITE_SCHEMA.\s(CVS\s3581)
-D 2007-01-09T15:06:42
+C Work\saround\swin2k\sproblems\sso\sthat\ssingle-character\sfilenames\scan\sbe\nused.\s\sTicket\s#2151.\s(CVS\s3582)
+D 2007-01-09T15:32:18
 F Makefile.in 7fa74bf4359aa899da5586e394d17735f221315f
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -83,7 +83,7 @@ F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
 F src/os_unix.c 9fbbd8ab0a6b3992370ba0f3aae11feff2a78c96
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
-F src/os_win.c 300709309613efa6529236d9aa5fc60d3920c4ff
+F src/os_win.c 788ae0fa4528d25ec9eb027c204500b83c63f8c6
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
 F src/pager.c d6ad66eb119602cb2e6a097f8f635372ba677d23
 F src/pager.h 2e6d42f4ae004ae748a037b8468112b851c447a7
@@ -424,7 +424,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P e1f7cf065d2c4ca53e233a4506759a1899ad0560
-R 48e8069888cd655ee7e8942bef8cd5a3
+P 31a661d424d0fe03eaf78f98031e360102dafeff
+R 0fc4861290a912ccbd1bba5ded51a7c9
 U drh
-Z 2e5f8d5a0aebfa7be6d672871e5c593e
+Z 5a70f6674cbfeef83c200da7a448ff2a

diff --git a/manifest.uuid b/manifest.uuid
index 65087ba68df2ea6be89aba8a036f117ac9a31e9f..93f334cd4ce8efa97d1da7b0468b8a6470bf6d39 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-31a661d424d0fe03eaf78f98031e360102dafeff
\ No newline at end of file
+c4eb2100c39356e1816cc6514d65155e47ea1a1d
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index 3bad01d30436e6b27fcf7c33f5f9cd5a7b11c240..3842ba94e527e94c127fcb61e5e5b86cc4564a41 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -1403,26 +1403,26 @@ char *sqlite3WinFullPathname(const char *zRelative){
   void *zConverted;
   zConverted = convertUtf8Filename(zRelative);
   if( isNT() ){
-    WCHAR *zTemp, *zNotUsedW;
-    nByte = GetFullPathNameW((WCHAR*)zConverted, 0, 0, &zNotUsedW) + 1;
+    WCHAR *zTemp;
+    nByte = GetFullPathNameW((WCHAR*)zConverted, 0, 0, 0) + 3;
     zTemp = sqliteMalloc( nByte*sizeof(zTemp[0]) );
     if( zTemp==0 ){
       sqliteFree(zConverted);
       return 0;
     }
-    GetFullPathNameW((WCHAR*)zConverted, nByte, zTemp, &zNotUsedW);
+    GetFullPathNameW((WCHAR*)zConverted, nByte, zTemp, 0);
     sqliteFree(zConverted);
     zFull = unicodeToUtf8(zTemp);
     sqliteFree(zTemp);
   }else{
-    char *zTemp, *zNotUsed;
-    nByte = GetFullPathNameA((char*)zConverted, 0, 0, &zNotUsed) + 1;
+    char *zTemp;
+    nByte = GetFullPathNameA((char*)zConverted, 0, 0, 0) + 3;
     zTemp = sqliteMalloc( nByte*sizeof(zTemp[0]) );
     if( zTemp==0 ){
       sqliteFree(zConverted);
       return 0;
     }
-    GetFullPathNameA((char*)zConverted, nByte, zTemp, &zNotUsed);
+    GetFullPathNameA((char*)zConverted, nByte, zTemp, 0);
     sqliteFree(zConverted);
     zFull = mbcsToUtf8(zTemp);
     sqliteFree(zTemp);