database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00
Code Activity

Allow the unlink() system call to be overridden in os_unix.c.

Browse Source 
FossilOrigin-Name: 8d1b5c3ac027ac00d57a250aad45230a09645617
This commit is contained in:
drh
2011-08-08 23:18:05 +00:00
parent a5ae4c330b
commit 036ac7fa90
4 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Remove\srelevant\selements\sfrom\sthe\ssqlite_stat2\stable\swhen\sdoing\sa\sDROP\nINDEX\sor\sDROP\sTABLE. C Allow\sthe\sunlink()\ssystem\scall\sto\sbe\soverridden\sin\sos_unix.c.
D 2011-08-07T01:31:52.877 D 2011-08-08T23:18:05.791
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 1e6988b3c11dee9bd5edc0c804bd4468d74a9cdc F Makefile.in 1e6988b3c11dee9bd5edc0c804bd4468d74a9cdc
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -165,7 +165,7 @@ F src/os.c fcc717427a80b2ed225373f07b642dc1aad7490b
F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
F src/os_common.h 65a897143b64667d23ed329a7984b9b405accb58 F src/os_common.h 65a897143b64667d23ed329a7984b9b405accb58
F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
F src/os_unix.c 51caec436f811fa387a85cf7b05f13962c7fe0dc F src/os_unix.c 597c854d9428b547717bcc9d2fc885a8030d7f86
F src/os_win.c 4eb6fa00ee28f6d7bad0526edcbe5a60d297c67a F src/os_win.c 4eb6fa00ee28f6d7bad0526edcbe5a60d297c67a
F src/pager.c 120550e7ef01dafaa2cbb4a0528c0d87c8f12b41 F src/pager.c 120550e7ef01dafaa2cbb4a0528c0d87c8f12b41
F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1 F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
@ -688,7 +688,7 @@ F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
F test/superlock.test 5d7a4954b0059c903f82c7b67867bc5451a7c082 F test/superlock.test 5d7a4954b0059c903f82c7b67867bc5451a7c082
F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85 F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85
F test/syscall.test 707c95e4ab7863e13f1293c6b0c76bead30249b3 F test/syscall.test a9d065ad1ef5f32446b1cb585a0e085b4e0996f5
F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f
F test/table.test 50c47f5fe9c112e92723af27cd735e6c92de6f85 F test/table.test 50c47f5fe9c112e92723af27cd735e6c92de6f85
F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126 F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
@ -955,7 +955,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262 F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
P b90c28be3840169651022ef36cd7cf416bc22305 P 3c8f97ae527e380bf2583c7cf8ceac9509f29bfe
R 73598e00e938e090a06d21036269e1f1 R 88d01aec65e2a86c5fc8acbdba857107
U drh U drh
Z 41423adf91510090095a57365c2e79b2 Z 304dbede0b6b9e99a78b17b48d6b9a6b

2
manifest.uuid
View File

@ -1 +1 @@
3c8f97ae527e380bf2583c7cf8ceac9509f29bfe 8d1b5c3ac027ac00d57a250aad45230a09645617

19
src/os_unix.c
View File

@ -394,6 +394,9 @@ static struct unix_syscall {
#endif #endif
#define osFallocate ((int(*)(int,off_t,off_t))aSyscall[15].pCurrent) #define osFallocate ((int(*)(int,off_t,off_t))aSyscall[15].pCurrent)
{ "unlink", (sqlite3_syscall_ptr)unlink, 0 },
#define osUnlink ((int(*)(const char*))aSyscall[16].pCurrent)
}; /* End of the overrideable system calls */ }; /* End of the overrideable system calls */
/* /*
@ -1761,7 +1764,7 @@ static int closeUnixFile(sqlite3_file *id){
#if OS_VXWORKS #if OS_VXWORKS
if( pFile->pId ){ if( pFile->pId ){
if( pFile->isDelete ){ if( pFile->isDelete ){
unlink(pFile->pId->zCanonicalName); osUnlink(pFile->pId->zCanonicalName);
} }
vxworksReleaseFileId(pFile->pId); vxworksReleaseFileId(pFile->pId);
pFile->pId = 0; pFile->pId = 0;
@ -2010,7 +2013,7 @@ static int dotlockUnlock(sqlite3_file *id, int eFileLock) {
/* To fully unlock the database, delete the lock file */ /* To fully unlock the database, delete the lock file */
assert( eFileLock==NO_LOCK ); assert( eFileLock==NO_LOCK );
if( unlink(zLockFile) ){ if( osUnlink(zLockFile) ){
int rc = 0; int rc = 0;
int tErrno = errno; int tErrno = errno;
if( ENOENT != tErrno ){ if( ENOENT != tErrno ){
@ -4162,7 +4165,7 @@ static int unixShmUnmap(
assert( pShmNode->nRef>0 ); assert( pShmNode->nRef>0 );
pShmNode->nRef--; pShmNode->nRef--;
if( pShmNode->nRef==0 ){ if( pShmNode->nRef==0 ){
if( deleteFlag && pShmNode->h>=0 ) unlink(pShmNode->zFilename); if( deleteFlag && pShmNode->h>=0 ) osUnlink(pShmNode->zFilename);
unixShmPurge(pDbFd); unixShmPurge(pDbFd);
} }
unixLeaveMutex(); unixLeaveMutex();
@ -4642,7 +4645,7 @@ static int fillInUnixFile(
if( rc!=SQLITE_OK ){ if( rc!=SQLITE_OK ){
if( h>=0 ) robust_close(pNew, h, __LINE__); if( h>=0 ) robust_close(pNew, h, __LINE__);
h = -1; h = -1;
unlink(zFilename); osUnlink(zFilename);
isDelete = 0; isDelete = 0;
} }
pNew->isDelete = isDelete; pNew->isDelete = isDelete;
@ -5049,7 +5052,7 @@ static int unixOpen(
#if OS_VXWORKS #if OS_VXWORKS
zPath = zName; zPath = zName;
#else #else
unlink(zName); osUnlink(zName);
#endif #endif
} }
#if SQLITE_ENABLE_LOCKING_STYLE #if SQLITE_ENABLE_LOCKING_STYLE
@ -5164,7 +5167,7 @@ static int unixDelete(
int rc = SQLITE_OK; int rc = SQLITE_OK;
UNUSED_PARAMETER(NotUsed); UNUSED_PARAMETER(NotUsed);
SimulateIOError(return SQLITE_IOERR_DELETE); SimulateIOError(return SQLITE_IOERR_DELETE);
if( unlink(zPath)==(-1) && errno!=ENOENT ){ if( osUnlink(zPath)==(-1) && errno!=ENOENT ){
return unixLogError(SQLITE_IOERR_DELETE, "unlink", zPath); return unixLogError(SQLITE_IOERR_DELETE, "unlink", zPath);
} }
#ifndef SQLITE_DISABLE_DIRSYNC #ifndef SQLITE_DISABLE_DIRSYNC
@ -5921,7 +5924,7 @@ static int proxyBreakConchLock(unixFile *pFile, uuid_t myHostID){
end_breaklock: end_breaklock:
if( rc ){ if( rc ){
if( fd>=0 ){ if( fd>=0 ){
unlink(tPath); osUnlink(tPath);
robust_close(pFile, fd, __LINE__); robust_close(pFile, fd, __LINE__);
} }
fprintf(stderr, "failed to break stale lock on %s, %s\n", cPath, errmsg); fprintf(stderr, "failed to break stale lock on %s, %s\n", cPath, errmsg);
@ -6744,7 +6747,7 @@ int sqlite3_os_init(void){
/* Double-check that the aSyscall[] array has been constructed /* Double-check that the aSyscall[] array has been constructed
** correctly. See ticket [bb3a86e890c8e96ab] */ ** correctly. See ticket [bb3a86e890c8e96ab] */
assert( ArraySize(aSyscall)==16 ); assert( ArraySize(aSyscall)==17 );
/* Register all VFSes defined in the aVfs[] array */ /* Register all VFSes defined in the aVfs[] array */
for(i=0; i<(sizeof(aVfs)/sizeof(sqlite3_vfs)); i++){ for(i=0; i<(sizeof(aVfs)/sizeof(sqlite3_vfs)); i++){

2
test/syscall.test
View File

@ -59,7 +59,7 @@ do_test 2.1.2 { test_syscall exists nosuchcall } 0
foreach s { foreach s {
open close access getcwd stat fstat ftruncate open close access getcwd stat fstat ftruncate
fcntl read pread write pwrite fchmod fallocate fcntl read pread write pwrite fchmod fallocate
pread64 pwrite64 pread64 pwrite64 unlink
} { } {
if {[test_syscall exists $s]} {lappend syscall_list $s} if {[test_syscall exists $s]} {lappend syscall_list $s}
} }