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

cwFileSystem.cpp : Fixed but in exapndPath() that rejected paths with spaces.

Browse Source
This commit is contained in:
kevin 2020-10-04 10:48:50 -04:00
parent 49d84eeb2e
commit 1232c3e36e
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cwFileSys.cpp
View File

@ -4,6 +4,7 @@
#include "cwFileSys.h" #include "cwFileSys.h"
#include "cwCommonImpl.h" #include "cwCommonImpl.h"
#include "cwMem.h" #include "cwMem.h"
#include "cwString.h"
#ifdef OS_LINUX #ifdef OS_LINUX
#include <libgen.h> // basename() dirname() #include <libgen.h> // basename() dirname()
@ -213,7 +214,7 @@ char* cw::filesys::expandPath( const char* dir )
wordexp_t res; wordexp_t res;
memset(&res,0,sizeof(res)); memset(&res,0,sizeof(res));
if((sysRC = wordexp(dir,&res,flags)) != 0) if((sysRC = wordexp(dir,&res,flags)) != 0)
{ {
switch(sysRC) switch(sysRC)
@ -242,16 +243,19 @@ char* cw::filesys::expandPath( const char* dir )
goto errLabel; goto errLabel;
} }
if( res.we_wordc > 1 ) switch( res.we_wordc )
{ {
rc = cwLogError(kOpFailRC,"Unexpected word expansion count: %i.", res.we_wordc ); case 0:
goto errLabel; newDir = str::dupl(dir);
break;
case 1:
newDir = str::dupl(res.we_wordv[0]);
break;
default:
newDir = str::join(" ", (const char**)res.we_wordv, res.we_wordc );
} }
if( res.we_wordc == 1 )
newDir = mem::duplStr(res.we_wordv[0]);
else
newDir = mem::duplStr(dir);
errLabel: errLabel:
if( rc != kOkRC ) if( rc != kOkRC )