aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2013-02-12 12:27:39 +0100
committerBjörn Gustavsson <[email protected]>2013-02-13 11:55:11 +0100
commit03b7c52a75c4af8d33b6b2a13bf7697709d3f6a3 (patch)
tree66ad8d4b4d6e0fbba202c62f620c6b35ce322536
parent943d65dac5aed83b2c0d6335bc792002bef374a0 (diff)
downloadotp-03b7c52a75c4af8d33b6b2a13bf7697709d3f6a3.tar.gz
otp-03b7c52a75c4af8d33b6b2a13bf7697709d3f6a3.tar.bz2
otp-03b7c52a75c4af8d33b6b2a13bf7697709d3f6a3.zip
Don't handle binaries from file:list_dir/1
In R16B, file:list_dir/1 will never return binaries.
-rw-r--r--lib/stdlib/src/filelib.erl7
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/stdlib/src/filelib.erl b/lib/stdlib/src/filelib.erl
index 318f3b87b8..ecc48e129d 100644
--- a/lib/stdlib/src/filelib.erl
+++ b/lib/stdlib/src/filelib.erl
@@ -315,13 +315,6 @@ do_wildcard_3(Base, [Pattern|Rest], Result, Mod) ->
do_wildcard_3(Base, [], Result, _Mod) ->
[Base|Result].
-wildcard_4(Pattern, [File|Rest], Base, Result) when is_binary(File) ->
- case wildcard_5(Pattern, binary_to_list(File)) of
- true ->
- wildcard_4(Pattern, Rest, Base, [join(Base, File)|Result]);
- false ->
- wildcard_4(Pattern, Rest, Base, Result)
- end;
wildcard_4(Pattern, [File|Rest], Base, Result) ->
case wildcard_5(Pattern, File) of
true ->