diff options
| author | Björn Gustavsson <[email protected]> | 2013-02-13 11:54:31 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-02-13 11:57:17 +0100 |
| commit | e96b2bc546b13a30707479838f1a5891147a5603 (patch) | |
| tree | ca837dc672a87ad334fff45dfdd5be73912830b7 | |
| parent | 03b7c52a75c4af8d33b6b2a13bf7697709d3f6a3 (diff) | |
| download | otp-e96b2bc546b13a30707479838f1a5891147a5603.tar.gz otp-e96b2bc546b13a30707479838f1a5891147a5603.tar.bz2 otp-e96b2bc546b13a30707479838f1a5891147a5603.zip | |
Don't allow binaries as the Cwd argument for filelib:wildcard()
filelib:wildcard() will no longer support "raw filenames", so it
makes no sense for it to accept a binary Cwd argument.
| -rw-r--r-- | lib/stdlib/src/filelib.erl | 4 | ||||
| -rw-r--r-- | lib/stdlib/test/filelib_SUITE.erl | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/lib/stdlib/src/filelib.erl b/lib/stdlib/src/filelib.erl index ecc48e129d..853cf6a6fa 100644 --- a/lib/stdlib/src/filelib.erl +++ b/lib/stdlib/src/filelib.erl @@ -53,14 +53,14 @@ wildcard(Pattern) when is_list(Pattern) -> -spec wildcard(Wildcard, Cwd) -> [file:filename()] when Wildcard :: filename() | dirname(), Cwd :: dirname(). -wildcard(Pattern, Cwd) when is_list(Pattern), (is_list(Cwd) or is_binary(Cwd)) -> +wildcard(Pattern, Cwd) when is_list(Pattern), is_list(Cwd) -> ?HANDLE_ERROR(do_wildcard(Pattern, Cwd, file)); wildcard(Pattern, Mod) when is_list(Pattern), is_atom(Mod) -> ?HANDLE_ERROR(do_wildcard(Pattern, Mod)). -spec wildcard(file:name(), file:name(), atom()) -> [file:filename()]. wildcard(Pattern, Cwd, Mod) - when is_list(Pattern), (is_list(Cwd) or is_binary(Cwd)), is_atom(Mod) -> + when is_list(Pattern), is_list(Cwd), is_atom(Mod) -> ?HANDLE_ERROR(do_wildcard(Pattern, Cwd, Mod)). -spec is_dir(Name) -> boolean() when diff --git a/lib/stdlib/test/filelib_SUITE.erl b/lib/stdlib/test/filelib_SUITE.erl index 2ef2b2bcaa..4a67d68428 100644 --- a/lib/stdlib/test/filelib_SUITE.erl +++ b/lib/stdlib/test/filelib_SUITE.erl @@ -83,11 +83,8 @@ wildcard_one(Config) when is_list(Config) -> wildcard_two(Config) when is_list(Config) -> ?line Dir = filename:join(?config(priv_dir, Config), "wildcard_two"), - ?line DirB = unicode:characters_to_binary(Dir, file:native_name_encoding()), ?line ok = file:make_dir(Dir), ?line do_wildcard_1(Dir, fun(Wc) -> io:format("~p~n",[{Wc,Dir, X = filelib:wildcard(Wc, Dir)}]),X end), - ?line do_wildcard_1(Dir, fun(Wc) -> io:format("~p~n",[{Wc,DirB, X = filelib:wildcard(Wc, DirB)}]), - [unicode:characters_to_list(Y,file:native_name_encoding()) || Y <- X] end), ?line do_wildcard_1(Dir, fun(Wc) -> filelib:wildcard(Wc, Dir++"/") end), case os:type() of {win32,_} -> |