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

Merge the latest trunk changes into the statvfs branch.

Browse Source 
FossilOrigin-Name: d5e36327c12f264429eb079bddbb71a310f76389
This commit is contained in:
drh
2011-12-23 00:25:02 +00:00
parent 3a7df358ab 9291372094
commit bec7c97899
11 changed files with 95 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/os_unix.c
View File

@@ -3917,10 +3917,8 @@ static int unixOpenSharedMemory(unixFile *pDbFd){
}
if( pInode->bProcessLock==0 ){
const char *zRO;
int openFlags = O_RDWR | O_CREAT;
zRO = sqlite3_uri_parameter(pDbFd->zPath, "readonly_shm");
if( zRO && sqlite3GetBoolean(zRO) ){
if( sqlite3_uri_boolean(pDbFd->zPath, "readonly_shm", 0) ){
openFlags = O_RDONLY;
pShmNode->isReadonly = 1;
}
@@ -4592,7 +4590,6 @@ static int fillInUnixFile(
const sqlite3_io_methods *pLockingStyle;
unixFile *pNew = (unixFile *)pId;
int rc = SQLITE_OK;
const char *zZeroDam; /* Value of the zero_damage query parameter */
assert( pNew->pInode==NULL );
@@ -4619,9 +4616,10 @@ static int fillInUnixFile(
pNew->h = h;
pNew->pVfs = pVfs;
pNew->zPath = zFilename;
zZeroDam = sqlite3_uri_parameter(zFilename, "zero_damage");
if( zZeroDam==0 ) zZeroDam = "1";
pNew->ctrlFlags = atoi(zZeroDam) ? UNIXFILE_ZERO_DAMAGE : 1;
pNew->ctrlFlags = 0;
if( sqlite3_uri_boolean(zFilename, "zero_damage", 1) ){
pNew->ctrlFlags |= UNIXFILE_ZERO_DAMAGE;
}
if( memcmp(pVfs->zName,"unix-excl",10)==0 ){
pNew->ctrlFlags |= UNIXFILE_EXCL;
}