diff options
author | Björn Gustavsson <[email protected]> | 2017-09-14 12:52:02 +0200 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2017-10-04 11:37:43 +0200 |
commit | 36dc96339e2b2b692e6dfe6de43db3a2348732bd (patch) | |
tree | ef62a03b52cc627de29fb5ad7250984c0a8a41f9 /lib/stdlib/test | |
parent | 49d0857634fc1a990ab97a144787288570fa2507 (diff) | |
download | otp-36dc96339e2b2b692e6dfe6de43db3a2348732bd.tar.gz otp-36dc96339e2b2b692e6dfe6de43db3a2348732bd.tar.bz2 otp-36dc96339e2b2b692e6dfe6de43db3a2348732bd.zip |
Implement escaping of special characters in wildcards
Allow characters with special meaning to be escaped using
\ (which must be writen as \\ in a string). That allows
matching of filenames containing characters that are special
in wildcards.
This is an incompatible change, but note that the use of backslashes
in wildcards would already work differently on Windows and Unix. Take
for example this call:
filelib:wildcard("a\\b")
On Windows, filelib:wildcard/1 would look for a directory named
"a", and a file or directory named "b" inside it.
On Unix, filelib:wildcard/1 would look for a file named "a\\b".
With this commit applied, filelib:wildcard/1 will look for
a file named "ab" on both Windows and Unix.
https://bugs.erlang.org/browse/ERL-451
Diffstat (limited to 'lib/stdlib/test')
-rw-r--r-- | lib/stdlib/test/filelib_SUITE.erl | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/lib/stdlib/test/filelib_SUITE.erl b/lib/stdlib/test/filelib_SUITE.erl index c94821bc75..1236fe45f4 100644 --- a/lib/stdlib/test/filelib_SUITE.erl +++ b/lib/stdlib/test/filelib_SUITE.erl @@ -120,7 +120,7 @@ wcc(Wc, Error) -> do_wildcard_1(Dir, Wcf0) -> do_wildcard_2(Dir, Wcf0), Wcf = fun(Wc0) -> - Wc = filename:join(Dir, Wc0), + Wc = Dir ++ "/" ++ Wc0, L = Wcf0(Wc), [subtract_dir(N, Dir) || N <- L] end, @@ -268,8 +268,37 @@ do_wildcard_9(Dir, Wcf) -> %% Cleanup. del(Files), [ok = file:del_dir(D) || D <- lists:reverse(Dirs)], - ok. + do_wildcard_10(Dir, Wcf). + +%% ERL-451/OTP-14577: Escape characters using \\. +do_wildcard_10(Dir, Wcf) -> + All0 = ["{abc}","abc","def","---","z--","@a,b","@c"], + All = case os:type() of + {unix,_} -> + %% '?' is allowed in file names on Unix, but + %% not on Windows. + ["?q"|All0]; + _ -> + All0 + end, + Files = mkfiles(lists:reverse(All), Dir), + + ["{abc}"] = Wcf("\\{a*"), + ["{abc}"] = Wcf("\\{abc}"), + ["abc","def","z--"] = Wcf("[a-z]*"), + ["---","abc","z--"] = Wcf("[a\\-z]*"), + ["@a,b","@c"] = Wcf("@{a\\,b,c}"), + ["@c"] = Wcf("@{a,b,c}"), + + case os:type() of + {unix,_} -> + ["?q"] = Wcf("\\?q"); + _ -> + [] = Wcf("\\?q") + end, + del(Files), + ok. fold_files(Config) when is_list(Config) -> Dir = filename:join(proplists:get_value(priv_dir, Config), "fold_files"), |