SQLite

Check-in [a6b85c7340]
Login

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
Timelines: family | ancestors | descendants | both | av-defense
Files: files | file ages | folders
SHA1: a6b85c73406caa3bf0585341c8ebc9897a1884f4
User & Date: drh 2011-07-22 21:25:57.525
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: 08d0e8799e 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: a6b85c7340 user: drh tags: av-defense)
11:23
Also add the sqlite3-all.c target to the MSVC makefile. (check-in: 8ce2b74a82 user: drh tags: trunk)
Changes
Side-by-Side Diff Ignore Whitespace Patch
Changes to src/os_common.h.
︙
26
27
28
29
30
31
32



33
34


35
36

37
38
39
40
41
42
43

26
27
28
29
30
31
32
33
34
35


36
37
38

39
40
41
42
43
44
45
46








+
+
+
-
-
+
+

-
+








** switch.  The following code should catch this problem at compile-time.
*/
#ifdef MEMORY_DEBUG
# error "The MEMORY_DEBUG macro is obsolete.  Use SQLITE_DEBUG instead."
#endif

#ifdef SQLITE_DEBUG
# ifndef SQLITE_DEBUG_OS_TRACE
#   define SQLITE_DEBUG_OS_TRACE 0
# endif
int sqlite3OSTrace = 0;
#define OSTRACE(X)          if( sqlite3OSTrace ) sqlite3DebugPrintf X
  int sqlite3OSTrace = SQLITE_DEBUG_OS_TRACE;
# define OSTRACE(X)          if( sqlite3OSTrace ) sqlite3DebugPrintf X
#else
#define OSTRACE(X)
# define OSTRACE(X)
#endif

/*
** Macros for performance tracing.  Normally turned off.  Only works
** on i486 hardware.
*/
#ifdef SQLITE_PERFORMANCE_TRACE
︙
Changes to src/os_win.c.
︙
2448
2449
2450
2451
2452
2453
2454

2455
2456
2457

2458
2459


2460
2461
2462
2463
2464
2465
2466

2448
2449
2450
2451
2452
2453
2454
2455
2456
2457

2458
2459

2460
2461
2462
2463
2464
2465
2466
2467
2468








+


-
+

-
+
+









  SimulateIOError( return SQLITE_IOERR_ACCESS; );
  zConverted = convertUtf8Filename(zFilename);
  if( zConverted==0 ){
    return SQLITE_NOMEM;
  }
  if( isNT() ){
    int cnt = 0;
    WIN32_FILE_ATTRIBUTE_DATA sAttrData;
    memset(&sAttrData, 0, sizeof(sAttrData));
    if( GetFileAttributesExW((WCHAR*)zConverted,
    while( (rc = GetFileAttributesExW((WCHAR*)zConverted,
                             GetFileExInfoStandard, 
                             &sAttrData) ){
                             &sAttrData)) && rc==0 && retryIoerr(&cnt) ){}
    if( rc ){
      /* For an SQLITE_ACCESS_EXISTS query, treat a zero-length file
      ** as if it does not exist.
      */
      if(    flags==SQLITE_ACCESS_EXISTS
          && sAttrData.nFileSizeHigh==0 
          && sAttrData.nFileSizeLow==0 ){
        attr = INVALID_FILE_ATTRIBUTES;
︙