diff options
| author | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-04-29 18:50:54 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-04-29 18:50:54 +0300 |
| commit | 1db22c965659b2e7bd003c59ee6f76840473d85f (patch) | |
| tree | de581d30db0de889fb130b6398d2ef2e76ac3d1a /src/mod_http_upload.erl | |
| parent | Fix offline from mam on mnesia (diff) | |
Improve code for directory deletion
Diffstat (limited to 'src/mod_http_upload.erl')
| -rw-r--r-- | src/mod_http_upload.erl | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mod_http_upload.erl b/src/mod_http_upload.erl index 1d9582961..b3600e709 100644 --- a/src/mod_http_upload.erl +++ b/src/mod_http_upload.erl @@ -975,9 +975,7 @@ remove_user(User, Server) -> end, ok. --spec del_tree(file:filename_all()) -> ok | {error, term()}. -del_tree(Dir) when is_binary(Dir) -> - del_tree(binary_to_list(Dir)); +-spec del_tree(file:filename_all()) -> ok | {error, file:posix()}. del_tree(Dir) -> try {ok, Entries} = file:list_dir(Dir), @@ -988,11 +986,9 @@ del_tree(Dir) -> false -> ok = file:delete(Path) end - end, [Dir ++ "/" ++ Entry || Entry <- Entries]), + end, [filename:join(Dir, Entry) || Entry <- Entries]), ok = file:del_dir(Dir) catch _:{badmatch, {error, Error}} -> - {error, Error}; - _:Error -> {error, Error} end. |