diff options
Diffstat (limited to 'project/dclib/dclib-basics.c')
| -rw-r--r-- | project/dclib/dclib-basics.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/project/dclib/dclib-basics.c b/project/dclib/dclib-basics.c index bf0496c..fdea8fc 100644 --- a/project/dclib/dclib-basics.c +++ b/project/dclib/dclib-basics.c @@ -697,7 +697,7 @@ ccp PathCatPP ( char * buf, size_t bufsize, ccp path1, ccp path2 ) // concatenate path + path; returns path1 | path2 | buf if ( !path1 || !*path1 ) - return path2 ? path2 : ""; + return path2 ? path2 : EmptyString; if ( !path2 || !*path2 ) return path1; @@ -714,6 +714,21 @@ ccp PathCatPP ( char * buf, size_t bufsize, ccp path1, ccp path2 ) /////////////////////////////////////////////////////////////////////////////// +ccp PathCatDirP ( char * buf, size_t bufsize, ccp path1, ccp path2 ) +{ + // concatenate path + path; returns path1 | path2 | buf + + if ( !path1 || !*path1 ) + return path2 ? path2 : EmptyString; + + if ( !path2 || !*path2 || !IsDirectory(path1,0) ) + return path1; + + return PathCatPP(buf,bufsize,path1,path2); +} + +/////////////////////////////////////////////////////////////////////////////// + ccp PathAllocPP ( ccp path1, ccp path2 ) { char buf[PATH_MAX]; |