From: shaneh <shaneh@noemail.net>
Date: Wed, 7 Jul 2010 14:45:40 +0000 (+0000)
Subject: Fixed a new error introduced by last check-in of os_win.c.  Updated xAccess() to... 
X-Git-Tag: version-3.7.2~171
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cce1b689f44dffdef3b2102ee42ea203630bde8d;p=thirdparty%2Fsqlite.git

Fixed a new error introduced by last check-in of os_win.c.  Updated xAccess() to support SimulateIOError().

FossilOrigin-Name: 8eefc287265443ec043bdab629597e79c9d22006
---

diff --git a/manifest b/manifest
index df53dfec5f..44aa258f21 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Remove\stwo\smore\stestcase()\smacros\sthat\srequire\s4GiB\sWAL\sfiles\sto\shit.
-D 2010-07-07T14:40:00
+C Fixed\sa\snew\serror\sintroduced\sby\slast\scheck-in\sof\sos_win.c.\s\sUpdated\sxAccess()\sto\ssupport\sSimulateIOError().
+D 2010-07-07T14:45:41
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c4270a1cd7cd70a263b7e96a258aa90e9c3618eb
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -158,7 +155,7 @@ F src/os.h d7775504a51e6e0d40315aa427b3e229ff9ff9ca
 F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 665876d5eec7585226b0a1cf5e18098de2b2da19
 F src/os_unix.c c6112f0ae34f23ae5ca0189a685e084befbdcf26
-F src/os_win.c c4b785547bbdf334f858c863c63177492e306c92
+F src/os_win.c f0a56db57896466b25c82d224131a2b095352555
 F src/pager.c 23e3b0d774cbedf19dc8636088078e921af7f47f
 F src/pager.h 879fdde5a102d2f21a3135d6f647530b21c2796c
 F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
@@ -834,14 +831,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 15f9c2713bdfd3d6c8d8d4298f101d128e39b99a
-R 31bf5600bb5411f5c923088d366ff09d
-U drh
-Z 229126a0bd3f70b25cec4ee40a7c7ad1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFMNJHDoxKgR168RlERAoXUAJ410m3TpyI87fykrv5V7t/PFDukwwCfb+US
-QPbUmbN9eK9YRV+qQPBskyU=
-=E0uV
------END PGP SIGNATURE-----
+P 16e18f2706e67210eae62edfb748758fd27f23d7
+R d81fca8d8b056aaa15f611129fe0dbdb
+U shaneh
+Z 3e0443c5ff4e51b41a4bec6a0360e8b4
diff --git a/manifest.uuid b/manifest.uuid
index d912d80544..d55c3b3b4e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-16e18f2706e67210eae62edfb748758fd27f23d7
\ No newline at end of file
+8eefc287265443ec043bdab629597e79c9d22006
\ No newline at end of file
diff --git a/src/os_win.c b/src/os_win.c
index 02df5aa625..859e6ad399 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -2080,8 +2080,11 @@ static int winAccess(
 ){
   DWORD attr;
   int rc = 0;
-  void *zConverted = convertUtf8Filename(zFilename);
+  void *zConverted;
   UNUSED_PARAMETER(pVfs);
+
+  SimulateIOError( return SQLITE_IOERR_ACCESS; );
+  zConverted = convertUtf8Filename(zFilename);
   if( zConverted==0 ){
     return SQLITE_NOMEM;
   }
@@ -2102,7 +2105,12 @@ static int winAccess(
         attr = sAttrData.dwFileAttributes;
       }
     }else{
-      return SQLITE_IOERR;
+      if( GetLastError()!=ERROR_FILE_NOT_FOUND ){
+        free(zConverted);
+        return SQLITE_IOERR_ACCESS;
+      }else{
+        attr = INVALID_FILE_ATTRIBUTES;
+      }
     }
 /* isNT() is 1 if SQLITE_OS_WINCE==1, so this else is never executed. 
 ** Since the ASCII version of these Windows API do not exist for WINCE,