recursively call os2Open() with the incoming VFS pointer, in case it gets used in...

FossilOrigin-Name: 6eac49f046d089dac90c0bf72e8c3fc583694dcd

diff --git a/manifest b/manifest
index c695b33c76a8118cb6e18d1a185e0ba3cf0e3d99..1a19c0232afb389c75099ef12582b95b5f6735b2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C move\sos2FullPathname()\sso\sthat\sit\scan\sbe\sused\sin\sos2Open()\sdirectly\s(CVS\s5495)
-D 2008-07-29T18:35:54
+C recursively\scall\sos2Open()\swith\sthe\sincoming\sVFS\spointer,\sin\scase\sit\sgets\sused\sin\sthe\sfuture\s(CVS\s5496)
+D 2008-07-29T18:38:47
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in bbb62eecc851379aef5a48a1bf8787eb13e6ec06
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -132,7 +132,7 @@ F src/mutex_w32.c f0d21ff1f6981e5aedc56796adf3a347423ef736
 F src/os.c 939ae7690a01d9401685ba124b4ba45fd4a7a2ad
 F src/os.h ef8abeb9afc694b82dbd169a91c9b7e26db3c892
 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
-F src/os_os2.c 3f4383c493106ec777b242bc2eee5ef46838aba7
+F src/os_os2.c a0dcdd2da3295bd09a07a1acdab86afb6ffa56a8
 F src/os_unix.c 1df6108efdb7957a9f28b9700600e58647c9c12d
 F src/os_win.c 50ec783403b418ddc9e6e05d541c6027dfd41070
 F src/pager.c a6ecad26297469a8a3d1fd7a7c3dc2d603955044
@@ -612,7 +612,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 0ce39c21f32958ae53c00dc8bbf8cdd453f2d90e
-R a9a0dc7d9673a9f296b12507bc3ba2c9
+P 2455e45484eff85bf9fd78dadd1e934f2bbe210a
+R c08a709d928946a5c84f642f0aef5c64
 U pweilbacher
-Z 4102ea838145bbe2d8042af7245b024f
+Z 269fe583177ea18da037cf06626e384d

diff --git a/manifest.uuid b/manifest.uuid
index 01a72577d9914a0d71801fdb65b062aebec6e529..0cda9df6b75b3de8c5508197727e73c872a1483e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2455e45484eff85bf9fd78dadd1e934f2bbe210a
\ No newline at end of file
+6eac49f046d089dac90c0bf72e8c3fc583694dcd
\ No newline at end of file

diff --git a/src/os_os2.c b/src/os_os2.c
index dfed6d895eaeec9adc7a9adfbf21324027643c7f..8c534455abe0b048f9ea08a45380bd5cd91d66e8 100644 (file)
--- a/src/os_os2.c
+++ b/src/os_os2.c
@@ -12,7 +12,7 @@
 **
 ** This file contains code that is specific to OS/2.
 **
-** $Id: os_os2.c,v 1.53 2008/07/29 18:35:54 pweilbacher Exp $
+** $Id: os_os2.c,v 1.54 2008/07/29 18:38:47 pweilbacher Exp $
 */
 
 #include "sqliteInt.h"
@@ -835,7 +835,7 @@ static int os2Open(
     pFile->pathToDel = NULL;
     if( flags & SQLITE_OPEN_READWRITE ){
       OSTRACE2( "OPEN %d Invalid handle\n", ((flags | SQLITE_OPEN_READONLY) & ~SQLITE_OPEN_READWRITE) );
-      return os2Open( 0, zName, id,
+      return os2Open( pVfs, zName, id,
                       ((flags | SQLITE_OPEN_READONLY) & ~SQLITE_OPEN_READWRITE),
                       pOutFlags );
     }else{