Fix conditional for retry logic in winAccess and add missing call to logIoerr.

FossilOrigin-Name: 8a145863d1a8711953ae72d706404fb96f6fec06

diff --git a/manifest b/manifest
index 4620ad344231de21f907bffe73c0e47863941b4d..4818017f6a6186b30f4f6dc5878181e9adb46447 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sosStat()\sinstead\sof\sstat()\sconsistently\sin\sos_unix.c
-D 2011-07-28T00:14:45.749
+C Fix\sconditional\sfor\sretry\slogic\sin\swinAccess\sand\sadd\smissing\scall\sto\slogIoerr.
+D 2011-07-28T07:34:44.659
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 1e6988b3c11dee9bd5edc0c804bd4468d74a9cdc
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -166,7 +166,7 @@ F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
 F src/os_common.h 65a897143b64667d23ed329a7984b9b405accb58
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
 F src/os_unix.c c617801bbe9a2233ceca4c3e3b8f5faedf955878
-F src/os_win.c 8449cb4ce1cd50248b7133108532d9582cc6c042
+F src/os_win.c 2d96ae3e548059caab14515ec5d44f7f9a627b57
 F src/pager.c 120550e7ef01dafaa2cbb4a0528c0d87c8f12b41
 F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
 F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
@@ -952,7 +952,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
-P 05c9832e5f6eb705f1dce4e65cf4e2d56512ff6b
-R a79be5193c847721eba9e1a1f8d0351d
-U drh
-Z 74ce5df3117db74444298f434c4c80d4
+P 9109128cb5640d687251dfbefa2fd998063cd9fb
+R 5bc8852e9677e7c4f366bdd5e0dbb83a
+U mistachkin
+Z 4ff729fa32427901a460673b5cd07868

diff --git a/manifest.uuid b/manifest.uuid
index 940999a63ea60af7b927ae57b1be28ee3d6c0e9a..3a5d35cf8422754b4ebba200bb04b16f13a3ac47 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9109128cb5640d687251dfbefa2fd998063cd9fb
\ No newline at end of file
+8a145863d1a8711953ae72d706404fb96f6fec06
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index 5d9bf5984306e17b974a0a35122805325a8b801c..4aaf74fefa09f237f01a6309a1f9a005451106c5 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -2455,7 +2455,7 @@ static int winAccess(
     int cnt = 0;
     WIN32_FILE_ATTRIBUTE_DATA sAttrData;
     memset(&sAttrData, 0, sizeof(sAttrData));
-    while( (rc = GetFileAttributesExW((WCHAR*)zConverted,
+    while( !(rc = GetFileAttributesExW((WCHAR*)zConverted,
                              GetFileExInfoStandard, 
                              &sAttrData)) && rc==0 && retryIoerr(&cnt) ){}
     if( rc ){
@@ -2470,6 +2470,7 @@ static int winAccess(
         attr = sAttrData.dwFileAttributes;
       }
     }else{
+      logIoerr(cnt);
       if( GetLastError()!=ERROR_FILE_NOT_FOUND ){
         winLogError(SQLITE_IOERR_ACCESS, "winAccess", zFilename);
         free(zConverted);