diff options
| author | ruki <[email protected]> | 2020-03-18 23:05:33 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-03-18 12:33:21 +0800 |
| commit | d81c6dee77d69e8116a5b6acd1d404f470a2aabb (patch) | |
| tree | db78e2d6f69cb3798e5153991955a1047cc6b99b /xmake/core/base/path.lua | |
| parent | c6c43cf5fd05f8fb161771eedf7abab57a958ba5 (diff) | |
improve path.directory
Diffstat (limited to 'xmake/core/base/path.lua')
| -rw-r--r-- | xmake/core/base/path.lua | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/xmake/core/base/path.lua b/xmake/core/base/path.lua index f3d3d4f03..f79590423 100644 --- a/xmake/core/base/path.lua +++ b/xmake/core/base/path.lua @@ -25,9 +25,15 @@ local path = path or {} local string = require("base/string") -- get the directory of the path -function path.directory(p) - local i = p:lastof("[/\\]") - if i then +function path.directory(p, sep) + local i = 0 + if sep then + -- if the path has been normalized, we can quickly find it with a unique path separator prompt + i = p:lastof(sep, true) or 0 + else + i = math.max(p:lastof('/', true) or 0, p:lastof('\\', true) or 0) + end + if i > 0 then if i > 1 then i = i - 1 end return p:sub(1, i) else @@ -36,9 +42,15 @@ function path.directory(p) end -- get the filename of the path -function path.filename(p) - local i = p:lastof("[/\\]") - if i then +function path.filename(p, sep) + local i = 0 + if sep then + -- if the path has been normalized, we can quickly find it with a unique path separator prompt + i = p:lastof(sep, true) or 0 + else + i = math.max(p:lastof('/', true) or 0, p:lastof('\\', true) or 0) + end + if i > 0 then return p:sub(i + 1) else return p |