diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2017-09-27 19:01:44 -0400 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2017-09-27 19:21:37 -0400 |
| commit | cf83eb7fc45fac677a83b5f38e87c581cf516cf2 (patch) | |
| tree | a01cef1a8c93e6a1c5d72d89a8f5ac6a82bbc0cb /src/rebar_dir.erl | |
| parent | c3f01c60139977dfad4723748e7c2f493fffd0ae (diff) | |
Corrects a fix to src_dir values
The previous patch at #7c959cc fixed the usage of duplicate values
for directories through relative paths, but mistakenly went overboard
and dropped the `./` path, which is still fairly common. Similarly for
`../".
The code is modified to special-case such values and keep the code
working.
Diffstat (limited to 'src/rebar_dir.erl')
| -rw-r--r-- | src/rebar_dir.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rebar_dir.erl b/src/rebar_dir.erl index 7a779d1..7182c10 100644 --- a/src/rebar_dir.erl +++ b/src/rebar_dir.erl @@ -197,8 +197,10 @@ make_normalized_path([], NormalizedPath) -> filename:join(lists:reverse(NormalizedPath)); make_normalized_path([H|T], NormalizedPath) -> case H of + "." when NormalizedPath == [], T == [] -> make_normalized_path(T, ["."]); "." -> make_normalized_path(T, NormalizedPath); - ".." -> make_normalized_path(T, tl(NormalizedPath)); + ".." when NormalizedPath == [] -> make_normalized_path(T, [".."]); + ".." when hd(NormalizedPath) =/= ".." -> make_normalized_path(T, tl(NormalizedPath)); _ -> make_normalized_path(T, [H|NormalizedPath]) end. |