database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Fix an assert() failing on OSX.

Browse Source 
FossilOrigin-Name: dca8763872aa6244cb1a0f519167b360a6372d0d
This commit is contained in:
dan
2010-10-05 11:33:15 +00:00
parent 0a9312d92d
commit 0015739ae5
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Prevent\sbackcompat.test\sfrom\smistaking\sdirectories\sfor\sbinary\sexecutables. C Fix\san\sassert()\sfailing\son\sOSX.
D 2010-10-05T08:13:44 D 2010-10-05T11:33:15
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -159,7 +159,7 @@ F src/os.c 22ac61d06e72a0dac900400147333b07b13d8e1d
F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e
F src/os_unix.c dd62c4b204fdf8a3804e28c7b09bcea98359ca53 F src/os_unix.c ae27ac760ad9c79f0fa3c96bfb31975c45aa704d
F src/os_win.c 2f90f7bdec714fad51cd31b4ecad3cc1b4bb5aad F src/os_win.c 2f90f7bdec714fad51cd31b4ecad3cc1b4bb5aad
F src/pager.c 4760042267a002216c208aeaa7fc6d0a85df94a5 F src/pager.c 4760042267a002216c208aeaa7fc6d0a85df94a5
F src/pager.h 8167a1e720d0b7a2790079007128e594010220ad F src/pager.h 8167a1e720d0b7a2790079007128e594010220ad
@@ -872,7 +872,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P ece641eb8951c6314cedbdb3243f91cb199c3239 P 717a1e50f005714b1d5233f80697db14cd8af659
R dc67a24b400f49df7bb254ce9f771e51 R d10845ef1e691a2ad01891e85e2d80d0
U dan U dan
Z 587203dfa138eccd760d5a9e6f1cf6e1 Z 652216f622ccc928c73ebb6c6f01edca

2
manifest.uuid
View File

@@ -1 +1 @@
717a1e50f005714b1d5233f80697db14cd8af659 dca8763872aa6244cb1a0f519167b360a6372d0d

11
src/os_unix.c
View File

@@ -4077,11 +4077,20 @@ static int fillInUnixFile(
*/ */
UNUSED_PARAMETER(isDelete); 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)); OSTRACE(("OPEN %-3d %s\n", h, zFilename));
pNew->h = h; pNew->h = h;
pNew->dirfd = dirfd; pNew->dirfd = dirfd;
pNew->fileFlags = 0; pNew->fileFlags = 0;
assert( zFilename==0 || zFilename[0]=='/' ); /* Never a relative pathname */
pNew->zPath = zFilename; pNew->zPath = zFilename;
#if OS_VXWORKS #if OS_VXWORKS