Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix uninitialized variable in os_unix.c. (CVS 3006) |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | 892e644d20b9d132cf29242a9bca0116ebe6968f |
| User & Date: | drh 2006-01-23 16:24:54 |
Context
|
2006-01-23
| ||
| 16:25 | Get I/O error tests working on windows. (CVS 3007) check-in: 2ef8b85d user: drh tags: trunk | |
| 16:24 | Fix uninitialized variable in os_unix.c. (CVS 3006) check-in: 892e644d user: drh tags: trunk | |
| 16:21 | Add "#ifndef NDEBUG" around sqlite3pager_iswriteable() (only used in assert() expressions). Also set the internal page number of a page to zero if it fails to initialise. (CVS 3005) check-in: 77969c67 user: danielk1977 tags: trunk | |
Changes
Changes to src/os_unix.c.
689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 ... 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 ... 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 ... 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 ... 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 .... 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 |
int *pReadonly
){
int rc;
unixFile f;
CRASH_TEST_OVERRIDE(sqlite3CrashOpenReadWrite, zFilename, pId, pReadonly);
assert( 0==*pId );
f.dirfd = -1;
SET_THREADID(&f);
f.h = open(zFilename, O_RDWR|O_CREAT|O_LARGEFILE|O_BINARY,
SQLITE_DEFAULT_FILE_PERMISSIONS);
if( f.h<0 ){
#ifdef EISDIR
if( errno==EISDIR ){
return SQLITE_CANTOPEN;
}
................................................................................
sqlite3OsEnterMutex();
rc = findLockInfo(f.h, &f.pLock, &f.pOpen);
sqlite3OsLeaveMutex();
if( rc ){
close(f.h);
return SQLITE_NOMEM;
}
f.locktype = 0;
TRACE3("OPEN %-3d %s\n", f.h, zFilename);
return allocateUnixFile(&f, pId);
}
/*
** Attempt to open a new file for exclusive access by this process.
................................................................................
unixFile f;
CRASH_TEST_OVERRIDE(sqlite3CrashOpenExclusive, zFilename, pId, delFlag);
assert( 0==*pId );
if( access(zFilename, 0)==0 ){
return SQLITE_CANTOPEN;
}
SET_THREADID(&f);
f.dirfd = -1;
f.h = open(zFilename,
O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW|O_LARGEFILE|O_BINARY,
SQLITE_DEFAULT_FILE_PERMISSIONS);
if( f.h<0 ){
return SQLITE_CANTOPEN;
}
sqlite3OsEnterMutex();
................................................................................
rc = findLockInfo(f.h, &f.pLock, &f.pOpen);
sqlite3OsLeaveMutex();
if( rc ){
close(f.h);
unlink(zFilename);
return SQLITE_NOMEM;
}
f.locktype = 0;
if( delFlag ){
unlink(zFilename);
}
TRACE3("OPEN-EX %-3d %s\n", f.h, zFilename);
return allocateUnixFile(&f, pId);
}
................................................................................
*/
int sqlite3UnixOpenReadOnly(const char *zFilename, OsFile **pId){
int rc;
unixFile f;
CRASH_TEST_OVERRIDE(sqlite3CrashOpenReadOnly, zFilename, pId, 0);
assert( 0==*pId );
SET_THREADID(&f);
f.dirfd = -1;
f.h = open(zFilename, O_RDONLY|O_LARGEFILE|O_BINARY);
if( f.h<0 ){
return SQLITE_CANTOPEN;
}
sqlite3OsEnterMutex();
rc = findLockInfo(f.h, &f.pLock, &f.pOpen);
sqlite3OsLeaveMutex();
if( rc ){
close(f.h);
return SQLITE_NOMEM;
}
f.locktype = 0;
TRACE3("OPEN-RO %-3d %s\n", f.h, zFilename);
return allocateUnixFile(&f, pId);
}
/*
** Attempt to open a file descriptor for the directory that contains a
** file. This file descriptor can be used to fsync() the directory
** in order to make sure the creation of a new file is actually written
................................................................................
/*
** Allocate memory for a unixFile. Initialize the new unixFile
** to the value given in pInit and return a pointer to the new
** OsFile. If we run out of memory, close the file and return NULL.
*/
static int allocateUnixFile(unixFile *pInit, OsFile **pId){
unixFile *pNew;
pNew = sqliteMalloc( sizeof(unixFile) );
if( pNew==0 ){
close(pInit->h);
sqlite3OsEnterMutex();
releaseLockInfo(pInit->pLock);
releaseOpenCnt(pInit->pOpen);
sqlite3OsLeaveMutex();
|
< < < < < < < < < < > > > > |
689 690 691 692 693 694 695 696 697 698 699 700 701 702 ... 712 713 714 715 716 717 718 719 720 721 722 723 724 725 ... 740 741 742 743 744 745 746 747 748 749 750 751 752 753 ... 754 755 756 757 758 759 760 761 762 763 764 765 766 767 ... 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 .... 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 |
int *pReadonly
){
int rc;
unixFile f;
CRASH_TEST_OVERRIDE(sqlite3CrashOpenReadWrite, zFilename, pId, pReadonly);
assert( 0==*pId );
f.h = open(zFilename, O_RDWR|O_CREAT|O_LARGEFILE|O_BINARY,
SQLITE_DEFAULT_FILE_PERMISSIONS);
if( f.h<0 ){
#ifdef EISDIR
if( errno==EISDIR ){
return SQLITE_CANTOPEN;
}
................................................................................
sqlite3OsEnterMutex();
rc = findLockInfo(f.h, &f.pLock, &f.pOpen);
sqlite3OsLeaveMutex();
if( rc ){
close(f.h);
return SQLITE_NOMEM;
}
TRACE3("OPEN %-3d %s\n", f.h, zFilename);
return allocateUnixFile(&f, pId);
}
/*
** Attempt to open a new file for exclusive access by this process.
................................................................................
unixFile f;
CRASH_TEST_OVERRIDE(sqlite3CrashOpenExclusive, zFilename, pId, delFlag);
assert( 0==*pId );
if( access(zFilename, 0)==0 ){
return SQLITE_CANTOPEN;
}
f.h = open(zFilename,
O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW|O_LARGEFILE|O_BINARY,
SQLITE_DEFAULT_FILE_PERMISSIONS);
if( f.h<0 ){
return SQLITE_CANTOPEN;
}
sqlite3OsEnterMutex();
................................................................................
rc = findLockInfo(f.h, &f.pLock, &f.pOpen);
sqlite3OsLeaveMutex();
if( rc ){
close(f.h);
unlink(zFilename);
return SQLITE_NOMEM;
}
if( delFlag ){
unlink(zFilename);
}
TRACE3("OPEN-EX %-3d %s\n", f.h, zFilename);
return allocateUnixFile(&f, pId);
}
................................................................................
*/
int sqlite3UnixOpenReadOnly(const char *zFilename, OsFile **pId){
int rc;
unixFile f;
CRASH_TEST_OVERRIDE(sqlite3CrashOpenReadOnly, zFilename, pId, 0);
assert( 0==*pId );
f.h = open(zFilename, O_RDONLY|O_LARGEFILE|O_BINARY);
if( f.h<0 ){
return SQLITE_CANTOPEN;
}
sqlite3OsEnterMutex();
rc = findLockInfo(f.h, &f.pLock, &f.pOpen);
sqlite3OsLeaveMutex();
if( rc ){
close(f.h);
return SQLITE_NOMEM;
}
TRACE3("OPEN-RO %-3d %s\n", f.h, zFilename);
return allocateUnixFile(&f, pId);
}
/*
** Attempt to open a file descriptor for the directory that contains a
** file. This file descriptor can be used to fsync() the directory
** in order to make sure the creation of a new file is actually written
................................................................................
/*
** Allocate memory for a unixFile. Initialize the new unixFile
** to the value given in pInit and return a pointer to the new
** OsFile. If we run out of memory, close the file and return NULL.
*/
static int allocateUnixFile(unixFile *pInit, OsFile **pId){
unixFile *pNew;
pInit->dirfd = -1;
pInit->fullSync = 0;
pInit->locktype = 0;
SET_THREADID(pInit);
pNew = sqliteMalloc( sizeof(unixFile) );
if( pNew==0 ){
close(pInit->h);
sqlite3OsEnterMutex();
releaseLockInfo(pInit->pLock);
releaseOpenCnt(pInit->pOpen);
sqlite3OsLeaveMutex();
|