diff options
| author | dan <dan@noemail.net> | 2010-10-05 11:33:15 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2010-10-05 11:33:15 +0000 |
| commit | 0015739ae53e149dc5162218e92506ec9e928dee (patch) | |
| tree | 37b7c568a06a09e6d7a37f668336df05e56398e4 /src/os_unix.c | |
| parent | 0a9312d92de9454b5d0ba670422fd68c8f39b818 (diff) | |
| download | sqlite-0015739ae53e149dc5162218e92506ec9e928dee.tar.gz sqlite-0015739ae53e149dc5162218e92506ec9e928dee.zip | |
Fix an assert() failing on OSX.
FossilOrigin-Name: dca8763872aa6244cb1a0f519167b360a6372d0d
Diffstat (limited to 'src/os_unix.c')
| -rw-r--r-- | src/os_unix.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index f1a65949f..a28db0bf0 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -4077,11 +4077,20 @@ static int fillInUnixFile( */ UNUSED_PARAMETER(isDelete); + /* Usually the path zFilename should not be a relative pathname. The + ** exception is when opening the proxy "conch" file in builds that + ** include the special Apple locking styles. + */ + assert( zFilename==0 || zFilename[0]=='/' +#if defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE + || pVfs->pAppData==(void*)&autolockIoFinder +#endif + ); + OSTRACE(("OPEN %-3d %s\n", h, zFilename)); pNew->h = h; pNew->dirfd = dirfd; pNew->fileFlags = 0; - assert( zFilename==0 || zFilename[0]=='/' ); /* Never a relative pathname */ pNew->zPath = zFilename; #if OS_VXWORKS |