diff options
| author | Vlad Ionescu <vlad@lshift.net> | 2009-09-23 14:31:30 +0100 |
|---|---|---|
| committer | Vlad Ionescu <vlad@lshift.net> | 2009-09-23 14:31:30 +0100 |
| commit | 73956170c3aaba621371e968d66d55323bca9756 (patch) | |
| tree | 426cac8717673a82e60726439f45fca53c4dce1d | |
| parent | 936e4de0ee9cf55ebb08246e2c367c8c64c66b51 (diff) | |
| download | rabbitmq-server-bug21285.tar.gz | |
removing rabbit_misc:absolute_pathbug21285
| -rw-r--r-- | src/rabbit.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 16 |
2 files changed, 1 insertions, 18 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 2b292412..27f085c2 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -217,8 +217,7 @@ log_location(Type) -> app_location() -> {ok, Application} = application:get_application(), - rabbit_misc:absolute_path( - code:where_is_file(atom_to_list(Application) ++ ".app")). + filename:absname(code:where_is_file(atom_to_list(Application) ++ ".app")). %--------------------------------------------------------------------------- diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 1af02ddf..95a274e3 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -55,7 +55,6 @@ -export([format_stderr/2]). -export([start_applications/1, stop_applications/1]). -export([unfold/2, ceil/1]). --export([absolute_path/1]). -import(mnesia). -import(lists). @@ -125,7 +124,6 @@ -spec(stop_applications/1 :: ([atom()]) -> 'ok'). -spec(unfold/2 :: (fun ((A) -> ({'true', B, A} | 'false')), A) -> {[B], A}). -spec(ceil/1 :: (number()) -> number()). --spec(absolute_path/1 :: (string()) -> string()). -endif. @@ -477,17 +475,3 @@ ceil(N) -> 0 -> N; _ -> 1 + T end. - -absolute_path(RelPath) -> - filename:join(absolute_path([], filename:split(filename:absname(RelPath)))). - -absolute_path([_ | ResultParts], [".." | Parts]) -> - absolute_path(ResultParts, Parts); -absolute_path([], [".." | Parts]) -> - absolute_path([], Parts); -absolute_path(ResultParts, ["." | Parts]) -> - absolute_path(ResultParts, Parts); -absolute_path(ResultParts, [Part | Parts]) -> - absolute_path([Part | ResultParts], Parts); -absolute_path(ResultParts, []) -> - lists:reverse(ResultParts). |