Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Add retry logic for AV defense to winAccess(). Also allow OS tracing to be enabled by a compile-time option. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | av-defense |
| Files: | files | file ages | folders |
| SHA1: |
a6b85c73406caa3bf0585341c8ebc989 |
| User & Date: | drh 2011-07-22 21:25:57 |
| Original Comment: | Add retry logic for AV defense to winAccess(). Also allow OS tracing to be enabled by a compile-time option. |
Context
|
2011-07-23
| ||
| 13:54 | Merge the winAccess retry logic from the anti-antivirus branch into the trunk. (check-in: 08d0e879 user: drh tags: trunk) | |
|
2011-07-22
| ||
| 21:25 | Add retry logic for AV defense to winAccess(). Also allow OS tracing to be enabled by a compile-time option. (Closed-Leaf check-in: a6b85c73 user: drh tags: av-defense) | |
| 11:23 | Also add the sqlite3-all.c target to the MSVC makefile. (check-in: 8ce2b74a user: drh tags: trunk) | |
Changes
Changes to src/os_common.h.
26 26 ** switch. The following code should catch this problem at compile-time. 27 27 */ 28 28 #ifdef MEMORY_DEBUG 29 29 # error "The MEMORY_DEBUG macro is obsolete. Use SQLITE_DEBUG instead." 30 30 #endif 31 31 32 32 #ifdef SQLITE_DEBUG 33 -int sqlite3OSTrace = 0; 34 -#define OSTRACE(X) if( sqlite3OSTrace ) sqlite3DebugPrintf X 33 +# ifndef SQLITE_DEBUG_OS_TRACE 34 +# define SQLITE_DEBUG_OS_TRACE 0 35 +# endif 36 + int sqlite3OSTrace = SQLITE_DEBUG_OS_TRACE; 37 +# define OSTRACE(X) if( sqlite3OSTrace ) sqlite3DebugPrintf X 35 38 #else 36 -#define OSTRACE(X) 39 +# define OSTRACE(X) 37 40 #endif 38 41 39 42 /* 40 43 ** Macros for performance tracing. Normally turned off. Only works 41 44 ** on i486 hardware. 42 45 */ 43 46 #ifdef SQLITE_PERFORMANCE_TRACE
Changes to src/os_win.c.
2448 2448 2449 2449 SimulateIOError( return SQLITE_IOERR_ACCESS; ); 2450 2450 zConverted = convertUtf8Filename(zFilename); 2451 2451 if( zConverted==0 ){ 2452 2452 return SQLITE_NOMEM; 2453 2453 } 2454 2454 if( isNT() ){ 2455 + int cnt = 0; 2455 2456 WIN32_FILE_ATTRIBUTE_DATA sAttrData; 2456 2457 memset(&sAttrData, 0, sizeof(sAttrData)); 2457 - if( GetFileAttributesExW((WCHAR*)zConverted, 2458 + while( (rc = GetFileAttributesExW((WCHAR*)zConverted, 2458 2459 GetFileExInfoStandard, 2459 - &sAttrData) ){ 2460 + &sAttrData)) && rc==0 && retryIoerr(&cnt) ){} 2461 + if( rc ){ 2460 2462 /* For an SQLITE_ACCESS_EXISTS query, treat a zero-length file 2461 2463 ** as if it does not exist. 2462 2464 */ 2463 2465 if( flags==SQLITE_ACCESS_EXISTS 2464 2466 && sAttrData.nFileSizeHigh==0 2465 2467 && sAttrData.nFileSizeLow==0 ){ 2466 2468 attr = INVALID_FILE_ATTRIBUTES;