cml/libcw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cwFile.h/cwFile.cpp : Added lastRC().

Browse Source
This commit is contained in:
kevin 2020-12-29 10:09:43 -05:00
parent 556cfe7f2b
commit adfe4a0bb9
2 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
cwFile.cpp
View File

@ -20,6 +20,7 @@ namespace cw
{ {
FILE* fp; FILE* fp;
char* fnStr; char* fnStr;
rc_t lastRC;
} this_t; } this_t;
@ -96,9 +97,10 @@ namespace cw
*bufByteCntPtr = 0; *bufByteCntPtr = 0;
if( !feof(p->fp ) ) if( !feof(p->fp ) )
return cwLogSysError(kReadFailRC,errno,"File read line failed"); return p->lastRC = cwLogSysError(kReadFailRC,errno,"File read line failed");
return kReadFailRC; p->lastRC = kEofRC;
return kEofRC;
} }
return kOkRC; return kOkRC;
@ -170,7 +172,7 @@ cw::rc_t cw::file::open( handle_t& hRef, const char* fn, unsigned flags )
errno = 0; errno = 0;
if((p->fp = fopen(fn,mode)) == nullptr ) if((p->fp = fopen(fn,mode)) == nullptr )
{ {
rc_t rc = cwLogSysError(kOpenFailRC,errno,"File open failed on file:'%s'.",cwStringNullGuard(fn)); rc_t rc = p->lastRC = cwLogSysError(kOpenFailRC,errno,"File open failed on file:'%s'.",cwStringNullGuard(fn));
mem::release(p); mem::release(p);
return rc; return rc;
} }
@ -191,7 +193,7 @@ cw::rc_t cw::file::close( handle_t& hRef )
errno = 0; errno = 0;
if( p->fp != nullptr ) if( p->fp != nullptr )
if( fclose(p->fp) != 0 ) if( fclose(p->fp) != 0 )
return cwLogSysError(kCloseFailRC,errno,"File close failed on '%s'.", cwStringNullGuard(p->fnStr)); return p->lastRC = cwLogSysError(kCloseFailRC,errno,"File close failed on '%s'.", cwStringNullGuard(p->fnStr));
mem::release(p); mem::release(p);
hRef.clear(); hRef.clear();
@ -202,20 +204,31 @@ cw::rc_t cw::file::close( handle_t& hRef )
bool cw::file::isValid( handle_t h ) bool cw::file::isValid( handle_t h )
{ return h.isValid(); } { return h.isValid(); }
cw::rc_t cw::file::read( handle_t h, void* buf, unsigned bufByteCnt ) cw::rc_t cw::file::lastRC( handle_t h )
{ {
this_t* p = _handleToPtr(h); this_t* p = _handleToPtr(h);
return p->lastRC;
errno = 0;
if( fread(buf,bufByteCnt,1,p->fp) != 1 )
{
if( feof( p->fp ) != 0 )
return kEofRC;
return cwLogSysError(kReadFailRC,errno,"File read failed on '%s'.", cwStringNullGuard(p->fnStr));
} }
return kOkRC; cw::rc_t cw::file::read( handle_t h, void* buf, unsigned bufByteCnt, unsigned* actualByteCntRef )
{
rc_t rc = kOkRC;
this_t* p = _handleToPtr(h);
unsigned actualByteCnt = 0;
errno = 0;
if(( actualByteCnt = fread(buf,1,bufByteCnt,p->fp)) != bufByteCnt )
{
if( feof( p->fp ) != 0 )
rc = p->lastRC = kEofRC;
else
rc= p->lastRC = cwLogSysError(kReadFailRC,errno,"File read failed on '%s'.", cwStringNullGuard(p->fnStr));
}
if( actualByteCntRef != nullptr )
*actualByteCntRef = actualByteCnt;
return rc;
} }
cw::rc_t cw::file::write( handle_t h, const void* buf, unsigned bufByteCnt ) cw::rc_t cw::file::write( handle_t h, const void* buf, unsigned bufByteCnt )
@ -224,7 +237,7 @@ cw::rc_t cw::file::write( handle_t h, const void* buf, unsigned bufByteCnt )
errno = 0; errno = 0;
if( fwrite(buf,bufByteCnt,1,p->fp) != 1 ) if( fwrite(buf,bufByteCnt,1,p->fp) != 1 )
return cwLogSysError(kWriteFailRC,errno,"File write failed on '%s'.", cwStringNullGuard(p->fnStr)); return p->lastRC = cwLogSysError(kWriteFailRC,errno,"File write failed on '%s'.", cwStringNullGuard(p->fnStr));
return kOkRC; return kOkRC;
} }
@ -249,6 +262,9 @@ cw::rc_t cw::file::seek( handle_t h, enum seekFlags_t flags, int offsByteCnt
if( fseek(p->fp,offsByteCnt,fileflags) != 0 ) if( fseek(p->fp,offsByteCnt,fileflags) != 0 )
return cwLogSysError(kSeekFailRC,errno,"File seek failed on '%s'",cwStringNullGuard(p->fnStr)); return cwLogSysError(kSeekFailRC,errno,"File seek failed on '%s'",cwStringNullGuard(p->fnStr));
// if the seek succeeded then override any previous error state
p->lastRC = kOkRC;
return kOkRC; return kOkRC;
} }
@ -260,7 +276,7 @@ cw::rc_t cw::file::tell( handle_t h, long* offsPtr )
errno = 0; errno = 0;
if((*offsPtr = ftell(p->fp)) == -1) if((*offsPtr = ftell(p->fp)) == -1)
return cwLogSysError(kOpFailRC,errno,"File tell failed on '%s'.", cwStringNullGuard(p->fnStr)); return p->lastRC = cwLogSysError(kOpFailRC,errno,"File tell failed on '%s'.", cwStringNullGuard(p->fnStr));
return kOkRC; return kOkRC;
} }
@ -280,13 +296,13 @@ unsigned cw::file::byteCount( handle_t h )
if((f = fileno(p->fp)) == -1) if((f = fileno(p->fp)) == -1)
{ {
cwLogSysError(kInvalidOpRC,errno,"%s because fileno() failed on '%s'.",errMsg,cwStringNullGuard(p->fnStr)); p->lastRC = cwLogSysError(kInvalidOpRC,errno,"%s because fileno() failed on '%s'.",errMsg,cwStringNullGuard(p->fnStr));
return 0; return 0;
} }
if(fstat(f,&sr) == -1) if(fstat(f,&sr) == -1)
{ {
cwLogSysError(kInvalidOpRC,errno,"%s because fstat() failed on '%s'.",errMsg,cwStringNullGuard(p->fnStr)); p->lastRC = cwLogSysError(kInvalidOpRC,errno,"%s because fstat() failed on '%s'.",errMsg,cwStringNullGuard(p->fnStr));
return 0; return 0;
} }
@ -782,7 +798,7 @@ cw::rc_t cw::file::print( handle_t h, const char* text )
errno = 0; errno = 0;
if( fputs(text,p->fp) < 0 ) if( fputs(text,p->fp) < 0 )
return cwLogSysError(kOpFailRC,errno,"File print failed on '%s'.", cwStringNullGuard(name(h))); return p->lastRC = cwLogSysError(kOpFailRC,errno,"File print failed on '%s'.", cwStringNullGuard(name(h)));
return kOkRC; return kOkRC;
} }
@ -793,7 +809,7 @@ cw::rc_t cw::file::vPrintf( handle_t h, const char* fmt, va_list vl )
this_t* p = _handleToPtr(h); this_t* p = _handleToPtr(h);
if( vfprintf(p->fp,fmt,vl) < 0 ) if( vfprintf(p->fp,fmt,vl) < 0 )
return cwLogSysError(kOpFailRC,errno,"File print failed on '%s'.", cwStringNullGuard(name(h))); return p->lastRC = cwLogSysError(kOpFailRC,errno,"File print failed on '%s'.", cwStringNullGuard(name(h)));
return kOkRC; return kOkRC;
} }

8
cwFile.h
View File

@ -41,8 +41,12 @@ namespace cw
// Return true if the file handle is associated with an open file. // Return true if the file handle is associated with an open file.
bool isValid( handle_t h ); bool isValid( handle_t h );
// Get the last error RC.
rc_t lastRC( handle_t h );
// Read a block bytes from a file. Equivalent to fread(). // Read a block bytes from a file. Equivalent to fread().
rc_t read( handle_t h, void* buf, unsigned bufByteCnt ); // 'actualByteCntRef is always the smae as bufByteCnt unless an error occurs or EOF is encountered.
rc_t read( handle_t h, void* buf, unsigned bufByteCnt, unsigned* actualByteCntRef=nullptr );
// Write a block of bytes to a file. Equivalent to fwrite(). // Write a block of bytes to a file. Equivalent to fwrite().
rc_t write( handle_t h, const void* buf, unsigned bufByteCnt ); rc_t write( handle_t h, const void* buf, unsigned bufByteCnt );
@ -219,7 +223,7 @@ namespace cw
// Read a string back from a file as written by fileWriteStr(). // Read a string back from a file as written by fileWriteStr().
// Note that the string will by string will be dynamically allocated // Note that the string will by string will be dynamically allocated
// and threfore must eventually be released via cmMemFree(). // and threfore must eventually be released via mem::free().
// If maxCharN is set to zero then the default maximum string // If maxCharN is set to zero then the default maximum string
// length is 16384. Note that this limit is used to prevent // length is 16384. Note that this limit is used to prevent
// corrupt files from generating excessively long strings. // corrupt files from generating excessively long strings.