Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added processing Tilde (~) sign in filename:absname #825

Closed
wants to merge 1 commit into from
Closed

Added processing Tilde (~) sign in filename:absname #825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions lib/stdlib/src/filename.erl
View file
Open in desktop
Expand Up @@ -64,6 +64,14 @@

-spec absname(Filename) -> file:filename_all() when
Filename :: file:name_all().
absname(<<$~, $/, RevPath/binary>>) ->
absname_home(RevPath);
absname([$~, $/|RevPath]) ->
absname_home(RevPath);
absname([Atom|Rest]) when is_atom(Atom) ->
absname(atom_to_list(Atom)++Rest);
absname([List|Rest]) when is_list(List) ->
absname(List++Rest);
absname(Name) ->
{ok, Cwd} = file:get_cwd(),
absname(Name, Cwd).
Expand All @@ -88,6 +96,12 @@ absname(Name, AbsBase) ->
absname_vr(split(Name), split(AbsBase), AbsBase)
end.

absname_home(RevPath) ->
case init:get_argument(home) of
{ok, [[Home]]} -> absname(RevPath, Home);
_ -> absname(RevPath)
end.

%% Handles volumerelative names (on Windows only).

absname_vr([<<"/">>|Rest1], [Volume|_], _AbsBase) ->
Expand Down
29 changes: 27 additions & 2 deletions lib/stdlib/test/filename_SUITE.erl
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@
-module(filename_SUITE).
-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
init_per_group/2,end_per_group/2]).
-export([absname/1, absname_2/1,
-export([absname_home/1, absname/1, absname_2/1,
basename_1/1, basename_2/1,
dirname/1, extension/1, join/1, t_nativename/1]).
-export([pathtype/1,rootname/1,split/1,find_src/1]).
Expand All @@ -34,7 +34,7 @@
suite() -> [{ct_hooks,[ts_install_cth]}].

all() ->
[absname, absname_2, basename_1, basename_2, dirname,
[absname_home, absname, absname_2, basename_1, basename_2, dirname,
extension,
join, pathtype, rootname, split, t_nativename, find_src,
absname_bin, absname_bin_2, basename_bin_1, basename_bin_2, dirname_bin,
Expand All @@ -56,6 +56,31 @@ init_per_group(_GroupName, Config) ->
end_per_group(_GroupName, Config) ->
Config.

-define(_assert(What),
begin ?line true = What end
).

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

absname_home(Config) when is_list(Config) ->
case init:get_argument(home) of
{ok, [[Home]]} ->
case os:type() of
{win32, _} ->
ok;
_ ->
?line ok = file:set_cwd("/"),
?_assert(Home ++ "/foo" =:= filename:absname("~/foo")),
?_assert(Home ++ "/../ebin" =:= filename:absname("~/../ebin")),
?_assert(Home ++ "/erlang" =:= filename:absname("~/erlang")),
?_assert(Home ++ "/erlang/src" =:= filename:absname("~/erlang/src")),
?_assert(Home ++ "/erlang/src" =:= filename:absname(["~/erl",'ang/s',"rc"])),
?_assert(Home ++ "/erlang/src" =:= filename:absname(["~/erl",'a','ng',"/",'s',"rc"])),
?_assert(Home ++ "/erlang/src" =:= filename:absname("~/erlang///src")),
?_assert(Home ++ "/file_sorter" =:= filename:absname(['~/' | file_sorter])),
ok
end
end.

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

Expand Down