aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2011-06-21 08:46:59 +0200
committerSiri Hansen <[email protected]>2011-06-21 08:46:59 +0200
commit7c2e7a481ed4dd2a1369ac87a00799a7efd7add7 (patch)
treec06af77a4be637a346666ad1ad6bd9eca2b4b644
parentd798caa64f4bb7509e89e6b8161c7eb196bc7270 (diff)
downloadotp-7c2e7a481ed4dd2a1369ac87a00799a7efd7add7.tar.gz
otp-7c2e7a481ed4dd2a1369ac87a00799a7efd7add7.tar.bz2
otp-7c2e7a481ed4dd2a1369ac87a00799a7efd7add7.zip
Remove compiler warning for using deprecated module rexexp
-rw-r--r--lib/sasl/src/systools_lib.erl33
1 files changed, 19 insertions, 14 deletions
diff --git a/lib/sasl/src/systools_lib.erl b/lib/sasl/src/systools_lib.erl
index b652c109fe..f951647b79 100644
--- a/lib/sasl/src/systools_lib.erl
+++ b/lib/sasl/src/systools_lib.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -176,21 +176,26 @@ add_dirs(RegName, Dirs, Root) ->
regexp_match(RegName, D0, Root) ->
case file:list_dir(D0) of
{ok, Files} when length(Files) > 0 ->
- FR = fun(F) ->
- case regexp:match(F, RegName) of
- {match,1,N} when N == length(F) ->
- DirF = join(D0, F, Root),
- case dir_p(DirF) of
- true ->
- {true, DirF};
+ case re:compile(RegName) of
+ {ok, MP} ->
+ FR = fun(F) ->
+ case re:run(F, MP) of
+ {match,[{0,N}]} when N == length(F) ->
+ DirF = join(D0, F, Root),
+ case dir_p(DirF) of
+ true ->
+ {true, DirF};
+ _ ->
+ false
+ end;
_ ->
false
- end;
- _ ->
- false
- end
- end,
- {true,lists:zf(FR, Files)};
+ end
+ end,
+ {true,lists:zf(FR, Files)};
+ _ ->
+ false
+ end;
_ ->
false
end.