aboutsummaryrefslogtreecommitdiff
path: root/src/os_unix.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2011-08-19 14:54:12 +0000
committerdrh <drh@noemail.net>2011-08-19 14:54:12 +0000
commitbd1e50c920319c78dc09c19b86c5dec42e472e29 (patch)
tree7641d74c85629b25f6997b5429bd51ab09216569 /src/os_unix.c
parentd5f12cd54d91fc857890cb846f62f3f65a1d3f36 (diff)
downloadsqlite-bd1e50c920319c78dc09c19b86c5dec42e472e29.tar.gz
sqlite-bd1e50c920319c78dc09c19b86c5dec42e472e29.zip
When retrying a write() after an EINTR error on unix, be sure to also
rerun the previous lseek(). Ticket [e59bdf6116036a] FossilOrigin-Name: 21452f3ae6b5882b03c7cc41e661c7b8144cc3df
Diffstat (limited to 'src/os_unix.c')
-rw-r--r--src/os_unix.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index 857ed58a9..83bf7b142 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3039,17 +3039,19 @@ static int seekAndWrite(unixFile *id, i64 offset, const void *pBuf, int cnt){
#elif defined(USE_PREAD64)
do{ got = osPwrite64(id->h, pBuf, cnt, offset);}while( got<0 && errno==EINTR);
#else
- newOffset = lseek(id->h, offset, SEEK_SET);
- SimulateIOError( newOffset-- );
- if( newOffset!=offset ){
- if( newOffset == -1 ){
- ((unixFile*)id)->lastErrno = errno;
- }else{
- ((unixFile*)id)->lastErrno = 0;
+ do{
+ newOffset = lseek(id->h, offset, SEEK_SET);
+ SimulateIOError( newOffset-- );
+ if( newOffset!=offset ){
+ if( newOffset == -1 ){
+ ((unixFile*)id)->lastErrno = errno;
+ }else{
+ ((unixFile*)id)->lastErrno = 0;
+ }
+ return -1;
}
- return -1;
- }
- do{ got = osWrite(id->h, pBuf, cnt); }while( got<0 && errno==EINTR );
+ got = osWrite(id->h, pBuf, cnt);
+ }while( got<0 && errno==EINTR );
#endif
TIMER_END;
if( got<0 ){