database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-18 10:21:03 +03:00
Code Activity

(OS/2) Armor OS/2 against accidental deletion of files, too (patch by Daniel Kruse, verified by me) (CVS 3293)

Browse Source 
FossilOrigin-Name: f357efb373b8631dbe4455530d060020b070bea2
This commit is contained in:
pweilbacher
2006-06-24 12:38:59 +00:00
parent 65fd59f731
commit 04bd0c15ac
4 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/os_os2.c
View File

@@ -53,9 +53,11 @@ struct os2File {
** Delete the named file
*/
int sqlite3Os2Delete( const char *zFilename ){
DosDelete( (PSZ)zFilename );
APIRET rc = NO_ERROR;
rc = DosDelete( (PSZ)zFilename );
TRACE2( "DELETE \"%s\"\n", zFilename );
return SQLITE_OK;
return rc == NO_ERROR ? SQLITE_OK : SQLITE_IOERR;
}
/*
@@ -92,7 +94,7 @@ int sqlite3Os2OpenReadWrite(
os2File f;
HFILE hf;
ULONG ulAction;
APIRET rc;
APIRET rc = NO_ERROR;
assert( *pld == 0 );
rc = DosOpen( (PSZ)zFilename, &hf, &ulAction, 0L,
@@ -142,7 +144,7 @@ int sqlite3Os2OpenExclusive( const char *zFilename, OsFile **pld, int delFlag ){
os2File f;
HFILE hf;
ULONG ulAction;
APIRET rc;
APIRET rc = NO_ERROR;
assert( *pld == 0 );
rc = DosOpen( (PSZ)zFilename, &hf, &ulAction, 0L, FILE_NORMAL,
@@ -174,7 +176,7 @@ int sqlite3Os2OpenReadOnly( const char *zFilename, OsFile **pld ){
os2File f;
HFILE hf;
ULONG ulAction;
APIRET rc;
APIRET rc = NO_ERROR;
assert( *pld == 0 );
rc = DosOpen( (PSZ)zFilename, &hf, &ulAction, 0L,
@@ -262,18 +264,19 @@ int sqlite3Os2TempFileName( char *zBuf ){
*/
int os2Close( OsFile **pld ){
os2File *pFile;
if( pld && (pFile = (os2File*)*pld)!=0 ){
APIRET rc = NO_ERROR;
if( pld && (pFile = (os2File*)*pld) != 0 ){
TRACE2( "CLOSE %d\n", pFile->h );
DosClose( pFile->h );
rc = DosClose( pFile->h );
pFile->locktype = NO_LOCK;
if( pFile->delOnClose != 0 ){
DosForceDelete( pFile->pathToDel );
rc = DosForceDelete( pFile->pathToDel );
}
*pld = 0;
OpenCounter( -1 );
}
return SQLITE_OK;
return rc == NO_ERROR ? SQLITE_OK : SQLITE_IOERR;
}
/*
@@ -295,7 +298,7 @@ int os2Read( OsFile *id, void *pBuf, int amt ){
** or some other error code on failure.
*/
int os2Write( OsFile *id, const void *pBuf, int amt ){
APIRET rc=NO_ERROR;
APIRET rc = NO_ERROR;
ULONG wrote;
assert( id!=0 );
SimulateIOError( SQLITE_IOERR );
@@ -314,7 +317,7 @@ int os2Write( OsFile *id, const void *pBuf, int amt ){
** Move the read/write pointer in a file.
*/
int os2Seek( OsFile *id, i64 offset ){
APIRET rc;
APIRET rc = NO_ERROR;
ULONG filePointer = 0L;
assert( id!=0 );
rc = DosSetFilePtr( ((os2File*)id)->h, offset, FILE_BEGIN, &filePointer );
@@ -328,7 +331,7 @@ int os2Seek( OsFile *id, i64 offset ){
int os2Sync( OsFile *id, int dataOnly ){
assert( id!=0 );
TRACE3( "SYNC %d lock=%d\n", ((os2File*)id)->h, ((os2File*)id)->locktype );
return DosResetBuffer( ((os2File*)id)->h ) ? SQLITE_IOERR : SQLITE_OK;
return DosResetBuffer( ((os2File*)id)->h ) == NO_ERROR ? SQLITE_OK : SQLITE_IOERR;
}
/*
@@ -344,7 +347,7 @@ int sqlite3Os2SyncDirectory( const char *zDirname ){
** Truncate an open file to a specified size
*/
int os2Truncate( OsFile *id, i64 nByte ){
APIRET rc;
APIRET rc = NO_ERROR;
ULONG upperBits = nByte>>32;
assert( id!=0 );
TRACE3( "TRUNCATE %d %lld\n", ((os2File*)id)->h, nByte );
@@ -361,7 +364,7 @@ int os2Truncate( OsFile *id, i64 nByte ){
** Determine the current size of a file in bytes
*/
int os2FileSize( OsFile *id, i64 *pSize ){
APIRET rc;
APIRET rc = NO_ERROR;
FILESTATUS3 fsts3FileInfo;
memset(&fsts3FileInfo, 0, sizeof(fsts3FileInfo));
assert( id!=0 );
@@ -453,7 +456,7 @@ int sqlite3Os2IsDirWritable( char *zDirname ){
*/
int os2Lock( OsFile *id, int locktype ){
APIRET rc = SQLITE_OK; /* Return code from subroutines */
APIRET res = 1; /* Result of a windows lock call */
APIRET res = NO_ERROR; /* Result of an OS/2 lock call */
int newLocktype; /* Set id->locktype to this value before exiting */
int gotPendingLock = 0;/* True if we acquired a PENDING lock this time */
FILELOCK LockArea,
@@ -583,7 +586,7 @@ int os2Lock( OsFile *id, int locktype ){
** non-zero, otherwise zero.
*/
int os2CheckReservedLock( OsFile *id ){
APIRET rc;
APIRET rc = NO_ERROR;
os2File *pFile = (os2File*)id;
assert( pFile!=0 );
if( pFile->locktype>=RESERVED_LOCK ){
@@ -780,7 +783,7 @@ int sqlite3Os2RandomSeed( char *zBuf ){
** in the random seed.
**
** When testing, initializing zBuf[] to zero is all we do. That means
** that we always use the same random number sequence.* This makes the
** that we always use the same random number sequence. This makes the
** tests repeatable.
*/
memset( zBuf, 0, 256 );