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

cwFileSys.h/cpp : Added makeVersionedFn().

Browse Source
This commit is contained in:
kevin 2021-04-10 13:36:07 -04:00
parent cb48b2bf81
commit df29219edf
2 changed files with 54 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
cwFileSys.cpp
View File

@ -140,9 +140,11 @@ char* cw::filesys::vMakeFn( const char* dir, const char* fn, const char* ext, va
n += strlen(ext) + 1; // add 1 for period
// get length of all var args dir's
while( (dp = va_arg(vl,const char*)) != nullptr )
while( (dp = va_arg(vl_t,const char*)) != nullptr )
n += strlen(dp) + 1; // add 1 for ending sep
va_end(vl_t);
// add 1 for terminating zero and allocate memory
if((rp = mem::allocZ<char>( n+1 )) == nullptr )
@ -151,8 +153,6 @@ char* cw::filesys::vMakeFn( const char* dir, const char* fn, const char* ext, va
goto errLabel;
}
va_copy(vl,vl_t);
rp[n] = 0;
rp[0] = 0;
@ -205,6 +205,43 @@ char* cw::filesys::makeFn( const char* dir, const char* fn, const char* ext, ..
return fnOut;
}
char* cw::filesys::vMakeVersionedFn(const char* dir, const char* fn_prefix, const char* ext, va_list vl )
{
char* fn = nullptr;
const unsigned max_version = 1024;
for(unsigned version = 0; version<max_version; ++version)
{
char name[ PATH_MAX ];
va_list vl0;
va_copy(vl0,vl);
snprintf(name,PATH_MAX,"%s_%i",fn_prefix,version);
fn = vMakeFn( dir, name, ext, vl0 );
va_end(vl0);
if( !isFile(fn) )
break;
mem::release(fn);
}
return fn;
}
char* cw::filesys::makeVersionedFn( const char* dir, const char* fn_prefix, const char* ext, ... )
{
va_list vl;
va_start(vl,ext);
char* fnOut = filesys::vMakeVersionedFn(dir,fn_prefix,ext,vl);
va_end(vl);
return fnOut;
}
char* cw::filesys::expandPath( const char* dir )
{
rc_t rc = kOkRC;
@ -663,8 +700,17 @@ cw::filesys::dirEntry_t* cw::filesys::dirEntries( const char* dirStr, unsigned f
cw::rc_t cw::filesys::makeDir( const char* dirStr )
{
if( mkdir(dirStr, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0 )
if( str::len(dirStr) == 0 )
return kOkRC;
char* s = filesys::expandPath(dirStr);
if( !isDir(s) )
if( mkdir(s, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0 )
return cwLogSysError( kOpFailRC, errno, "The attempt to create the directory '%s' failed.",dirStr);
mem::release(s);
return kOkRC;
}

3
cwFileSys.h
View File

@ -24,6 +24,9 @@ namespace cw
char* vMakeFn( const char* dir, const char* fn, const char* ext, va_list vl );
char* makeFn( const char* dir, const char* fn, const char* ext, ... );
char* vMakeVersionedFn(const char* dir, const char* fn_prefix, const char* ext, va_list vl );
char* makeVersionedFn( const char* dir, const char* fn_prefix, const char* ext, ... );
// The returned string must be released by a call to mem::release() or mem::free().
char* expandPath( const char* dir );