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

Assume any return code from fcntl() other than -1 is success. Formerly we

Browse Source 
only assumed that 0 was success.  Ticket #2173. (CVS 3754)

FossilOrigin-Name: 8d0073c0e8408558dae39f789ac3fa2622b52365
This commit is contained in:
drh
2007-03-29 20:19:58 +00:00
parent 19c9e5694c
commit e2396a1090
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Fix\sto\stoken\sdestructors\sin\sLemon.\s\sThis\sdoes\snot\simpact\sSQLite.\s\sTicket\s#2175.\s(CVS\s3753) C Assume\sany\sreturn\scode\sfrom\sfcntl()\sother\sthan\s-1\sis\ssuccess.\s\sFormerly\swe\nonly\sassumed\sthat\s0\swas\ssuccess.\s\sTicket\s#2173.\s(CVS\s3754)
D 2007-03-29T20:13:53 D 2007-03-29T20:19:59
F Makefile.in 2f2c3bf69faf0ae7b8e8af4f94f1986849034530 F Makefile.in 2f2c3bf69faf0ae7b8e8af4f94f1986849034530
F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -82,7 +82,7 @@ F src/os_os2.c 313ece302183dfd83c4f281e1972656b7e6b672e
F src/os_os2.h e5f17dd69333632bbc3112881ea407c37d245eb3 F src/os_os2.h e5f17dd69333632bbc3112881ea407c37d245eb3
F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
F src/os_unix.c 5f7ee6c930084bcae48fd2caf4f73011d2c0795b F src/os_unix.c fe0c0175036a5fb40124480771895ba524efa132
F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
F src/os_win.c d6cb36287a13a75cbf0b7084399c7884a96c4340 F src/os_win.c d6cb36287a13a75cbf0b7084399c7884a96c4340
F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
@@ -447,7 +447,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
P 3111b43ec333f3342f9609bf441160040f3d1501 P 6195af49828bf04b61d24f116339780d3eb926a1
R c72df6846ce8cb719dc4f7dfcd4ac498 R 79d0ea3ee011e976af26b5841e567527
U drh U drh
Z 3611f69426c7b55a3a9f2aa24567568b Z debf887eb36a11345fb4f0356547effd

2
manifest.uuid
View File

@@ -1 +1 @@
6195af49828bf04b61d24f116339780d3eb926a1 8d0073c0e8408558dae39f789ac3fa2622b52365

14
src/os_unix.c
View File

@@ -457,7 +457,7 @@ static int lockTrace(int fd, int op, struct flock *p){
sqlite3DebugPrintf("fcntl %d %d %s %s %d %d %d %d\n", sqlite3DebugPrintf("fcntl %d %d %s %s %d %d %d %d\n",
threadid, fd, zOpName, zType, (int)p->l_start, (int)p->l_len, threadid, fd, zOpName, zType, (int)p->l_start, (int)p->l_len,
(int)p->l_pid, s); (int)p->l_pid, s);
if( s && op==F_SETLK && (p->l_type==F_RDLCK || p->l_type==F_WRLCK) ){ if( s==(-1) && op==F_SETLK && (p->l_type==F_RDLCK || p->l_type==F_WRLCK) ){
struct flock l2; struct flock l2;
l2 = *p; l2 = *p;
fcntl(fd, F_GETLK, &l2); fcntl(fd, F_GETLK, &l2);
@@ -1484,7 +1484,7 @@ static int unixLock(OsFile *id, int locktype){
lock.l_type = (locktype==SHARED_LOCK?F_RDLCK:F_WRLCK); lock.l_type = (locktype==SHARED_LOCK?F_RDLCK:F_WRLCK);
lock.l_start = PENDING_BYTE; lock.l_start = PENDING_BYTE;
s = fcntl(pFile->h, F_SETLK, &lock); s = fcntl(pFile->h, F_SETLK, &lock);
if( s ){ if( s==(-1) ){
rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY; rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY;
goto end_lock; goto end_lock;
} }
@@ -1511,7 +1511,7 @@ static int unixLock(OsFile *id, int locktype){
rc = SQLITE_IOERR_UNLOCK; /* This should never happen */ rc = SQLITE_IOERR_UNLOCK; /* This should never happen */
goto end_lock; goto end_lock;
} }
if( s ){ if( s==(-1) ){
rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY; rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY;
}else{ }else{
pFile->locktype = SHARED_LOCK; pFile->locktype = SHARED_LOCK;
@@ -1541,7 +1541,7 @@ static int unixLock(OsFile *id, int locktype){
assert(0); assert(0);
} }
s = fcntl(pFile->h, F_SETLK, &lock); s = fcntl(pFile->h, F_SETLK, &lock);
if( s ){ if( s==(-1) ){
rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY; rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY;
} }
} }
@@ -1595,7 +1595,7 @@ static int unixUnlock(OsFile *id, int locktype){
lock.l_whence = SEEK_SET; lock.l_whence = SEEK_SET;
lock.l_start = SHARED_FIRST; lock.l_start = SHARED_FIRST;
lock.l_len = SHARED_SIZE; lock.l_len = SHARED_SIZE;
if( fcntl(pFile->h, F_SETLK, &lock)!=0 ){ if( fcntl(pFile->h, F_SETLK, &lock)==(-1) ){
/* This should never happen */ /* This should never happen */
rc = SQLITE_IOERR_RDLOCK; rc = SQLITE_IOERR_RDLOCK;
} }
@@ -1604,7 +1604,7 @@ static int unixUnlock(OsFile *id, int locktype){
lock.l_whence = SEEK_SET; lock.l_whence = SEEK_SET;
lock.l_start = PENDING_BYTE; lock.l_start = PENDING_BYTE;
lock.l_len = 2L; assert( PENDING_BYTE+1==RESERVED_BYTE ); lock.l_len = 2L; assert( PENDING_BYTE+1==RESERVED_BYTE );
if( fcntl(pFile->h, F_SETLK, &lock)==0 ){ if( fcntl(pFile->h, F_SETLK, &lock)!=(-1) ){
pLock->locktype = SHARED_LOCK; pLock->locktype = SHARED_LOCK;
}else{ }else{
rc = SQLITE_IOERR_UNLOCK; /* This should never happen */ rc = SQLITE_IOERR_UNLOCK; /* This should never happen */
@@ -1622,7 +1622,7 @@ static int unixUnlock(OsFile *id, int locktype){
lock.l_type = F_UNLCK; lock.l_type = F_UNLCK;
lock.l_whence = SEEK_SET; lock.l_whence = SEEK_SET;
lock.l_start = lock.l_len = 0L; lock.l_start = lock.l_len = 0L;
if( fcntl(pFile->h, F_SETLK, &lock)==0 ){ if( fcntl(pFile->h, F_SETLK, &lock)!=(-1) ){
pLock->locktype = NO_LOCK; pLock->locktype = NO_LOCK;
}else{ }else{
rc = SQLITE_IOERR_UNLOCK; /* This should never happen */ rc = SQLITE_IOERR_UNLOCK; /* This should never happen */