From 67b0f0c042fe833a666fa2f6d9b882a1c66998db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 20 Feb 2012 14:45:43 +0100
Subject: Allow ** in filelib:wildcard

Two adjacent * used as a single pattern will match
all files and zero or more directories and subdirectories.
---
 lib/stdlib/src/filelib.erl | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'lib/stdlib/src')

diff --git a/lib/stdlib/src/filelib.erl b/lib/stdlib/src/filelib.erl
index 6b19713609..318f3b87b8 100644
--- a/lib/stdlib/src/filelib.erl
+++ b/lib/stdlib/src/filelib.erl
@@ -301,6 +301,8 @@ do_wildcard_2([File|Rest], Pattern, Result, Mod) ->
 do_wildcard_2([], _, Result, _Mod) ->
     Result.
 
+do_wildcard_3(Base, [[double_star]|Rest], Result, Mod) ->
+    lists:sort(do_double_star(current, [Base], Rest, Result, Mod, true));
 do_wildcard_3(Base, [Pattern|Rest], Result, Mod) ->
     case do_list_dir(Base, Mod) of
 	{ok, Files0} ->
@@ -334,6 +336,8 @@ wildcard_5([question|Rest1], [_|Rest2]) ->
     wildcard_5(Rest1, Rest2);
 wildcard_5([accept], _) ->
     true;
+wildcard_5([double_star], _) ->
+    true;
 wildcard_5([star|Rest], File) ->
     do_star(Rest, File);
 wildcard_5([{one_of, Ordset}|Rest], [C|File]) ->
@@ -354,6 +358,21 @@ wildcard_5([], [_|_]) ->
 wildcard_5([_|_], []) ->
     false.
 
+do_double_star(Base, [H|T], Rest, Result, Mod, Root) ->
+    Full = join(Base, H),
+    Result1 = case do_list_dir(Full, Mod) of
+        {ok, Files} ->
+            do_double_star(Full, Files, Rest, Result, Mod, false);
+        _ -> Result
+    end,
+    Result2 = case Root andalso Rest == [] of
+        true  -> Result1;
+        false -> do_wildcard_3(Full, Rest, Result1, Mod)
+    end,
+    do_double_star(Base, T, Rest, Result2, Mod, Root);
+do_double_star(_Base, [], _Rest, Result, _Mod, _Root) ->
+    Result.
+
 do_star(Pattern, [X|Rest]) ->
     case wildcard_5(Pattern, [X|Rest]) of
 	true  -> true;
@@ -425,6 +444,10 @@ compile_part([$}|Rest], true, Result) ->
     {ok, $}, lists:reverse(Result), Rest};
 compile_part([$?|Rest], Upto, Result) ->
     compile_part(Rest, Upto, [question|Result]);
+compile_part([$*,$*], Upto, Result) ->
+    compile_part([], Upto, [double_star|Result]);
+compile_part([$*,$*|Rest], Upto, Result) ->
+    compile_part(Rest, Upto, [star|Result]);
 compile_part([$*], Upto, Result) ->
     compile_part([], Upto, [accept|Result]);
 compile_part([$*|Rest], Upto, Result) ->
-- 
cgit v1.2.3