Skip to content

Commit

Permalink
HPCC-30469 Revise based on review
Browse files Browse the repository at this point in the history
Signed-off-by: wangkx <[email protected]>
  • Loading branch information
wangkx committed Oct 13, 2023
1 parent 4d9ddba commit 37228d9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
6 changes: 5 additions & 1 deletion dali/base/dautils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1483,8 +1483,12 @@ bool CDfsLogicalFileName::getExternalPath(StringBuffer &dir, StringBuffer &tail,
//If the prefix is a PathSepChar, it should not be appended to the dir here because
//a PathSepChar will be appended to the dir inside the expandExternalPath() if the s
//is started with the "::".
if (!streq(prefix, iswin ? "\\" : "/"))
//Also a trailing pathsepchar in the prefix should be removed.
if (!isRootDirectory(prefix))
{
dir.append(prefix);
removeTrailingPathSepChar(dir);
}
}
}
}
Expand Down
1 change: 1 addition & 0 deletions esp/services/ws_fileio/ws_fileioservice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ bool CWsFileIOEx::onReadFileData(IEspContext &context, IEspReadFileDataRequest &
return true;
}

//Despite the "DestRelativePath" saying it's relative for legacy reason, it also supports absolute paths.
const char* destRelativePath = req.getDestRelativePath();
if (!destRelativePath || (destRelativePath[0] == 0))
{
Expand Down

0 comments on commit 37228d9

Please sign in to comment.