aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src/filelib.erl
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-10-01 10:32:42 +0200
committerMarcus Arendt <[email protected]>2014-10-01 10:32:42 +0200
commit86ae7ccc44b38137c504a46b619ffad935d74b99 (patch)
treed1dbb0f51c128ed33fad8b18f147e1ef0b008605 /lib/stdlib/src/filelib.erl
parent40bfc04288f623d7dbabc90f0c93c6baef997ba7 (diff)
parenta476a844554d25fd704888f63a302659aa5dc67a (diff)
downloadotp-86ae7ccc44b38137c504a46b619ffad935d74b99.tar.gz
otp-86ae7ccc44b38137c504a46b619ffad935d74b99.tar.bz2
otp-86ae7ccc44b38137c504a46b619ffad935d74b99.zip
Merge branch 'capflam/filelib_wildcard_fix' into maint
* capflam/filelib_wildcard_fix: Fix filelib:wildcard/2 when 'Cwd' ends with a dot
Diffstat (limited to 'lib/stdlib/src/filelib.erl')
-rw-r--r--lib/stdlib/src/filelib.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/filelib.erl b/lib/stdlib/src/filelib.erl
index 9efbe8da20..daae1fd2d2 100644
--- a/lib/stdlib/src/filelib.erl
+++ b/lib/stdlib/src/filelib.erl
@@ -371,7 +371,7 @@ compile_wildcard(Pattern, Cwd0) ->
[Root|Rest] = filename:split(Pattern),
case filename:pathtype(Root) of
relative ->
- Cwd = filename:join([Cwd0]),
+ Cwd = prepare_base(Cwd0),
compile_wildcard_2([Root|Rest], {cwd,Cwd});
_ ->
compile_wildcard_2(Rest, {root,0,Root})