aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorBjörn Gustavsson <bjorn@erlang.org>2013-02-05 14:02:25 +0100
committerBjörn Gustavsson <bjorn@erlang.org>2013-02-11 14:16:48 +0100
commit6d516de001dde82c02fe050db8e3aab47914fa90 (patch)
treec2757a6d77864507410bcdfdfbe144b685d60af3 /erts
parenta8a8d27a461e82af3f88774e07906a920f95e63e (diff)
downloadotp-6d516de001dde82c02fe050db8e3aab47914fa90.tar.gz
otp-6d516de001dde82c02fe050db8e3aab47914fa90.tar.bz2
otp-6d516de001dde82c02fe050db8e3aab47914fa90.zip
prim_file: Add list_dir_all() and read_link_all()
Diffstat (limited to 'erts')
-rw-r--r--erts/preloaded/ebin/prim_file.beambin42004 -> 44092 bytes
-rw-r--r--erts/preloaded/src/prim_file.erl57
2 files changed, 55 insertions, 2 deletions
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
index b1b54ca050..f7b3aac376 100644
--- a/erts/preloaded/ebin/prim_file.beam
+++ b/erts/preloaded/ebin/prim_file.beam
Binary files differ
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index 305abb8b0a..bf8879c2a0 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -50,9 +50,9 @@
write_file_info/2, write_file_info/3, write_file_info/4,
make_link/2, make_link/3,
make_symlink/2, make_symlink/3,
- read_link/1, read_link/2,
+ read_link/1, read_link/2, read_link_all/1, read_link_all/2,
read_link_info/1, read_link_info/2, read_link_info/3,
- list_dir/1, list_dir/2]).
+ list_dir/1, list_dir/2, list_dir_all/1, list_dir_all/2]).
%% How to start and stop the ?DRV port.
-export([start/0, stop/1]).
@@ -877,6 +877,18 @@ read_link_int(Port, Link) ->
drv_command(Port, [?FILE_READLINK, pathname(Link)],
fun handle_fname_response/1).
+%% read_link_all/{2,3}
+
+read_link_all(Link) ->
+ read_link_all_int({?DRV, [binary]}, Link).
+
+read_link_all(Port, Link) when is_port(Port) ->
+ read_link_all_int(Port, Link).
+
+read_link_all_int(Port, Link) ->
+ drv_command(Port, [?FILE_READLINK, pathname(Link)],
+ fun handle_fname_response_all/1).
+
%% read_link_info/{2,3}
@@ -927,6 +939,23 @@ list_dir_int(Port, Dir) ->
end
end).
+list_dir_all(Dir) ->
+ list_dir_all_int({?DRV, [binary]}, Dir).
+
+list_dir_all(Port, Dir) when is_port(Port) ->
+ list_dir_all_int(Port, Dir).
+
+list_dir_all_int(Port, Dir) ->
+ drv_command(Port, [?FILE_READDIR, pathname(Dir)],
+ fun(P) ->
+ case list_dir_response(P, []) of
+ {ok, RawNames} ->
+ {ok, list_dir_convert_all(RawNames)};
+ Error ->
+ Error
+ end
+ end).
+
list_dir_response(Port, Acc0) ->
case drv_get_response(Port) of
{lfname, []} ->
@@ -956,6 +985,17 @@ list_dir_convert([Name|Names]) ->
end;
list_dir_convert([]) -> [].
+list_dir_convert_all([Name|Names]) ->
+ %% If the filename cannot be converted, retain the filename as
+ %% a binary.
+ case prim_file:internal_native2name(Name) of
+ {error, _} ->
+ [Name|list_dir_convert(Names)];
+ Converted when is_list(Converted) ->
+ [Converted|list_dir_convert(Names)]
+ end;
+list_dir_convert_all([]) -> [].
+
%%%-----------------------------------------------------------------
%%% Functions to communicate with the driver
@@ -977,6 +1017,19 @@ handle_fname_response(Port) ->
Error
end.
+handle_fname_response_all(Port) ->
+ case drv_get_response(Port) of
+ {fname, Name} ->
+ case prim_file:internal_native2name(Name) of
+ {error, _} ->
+ {ok, Name};
+ Converted when is_list(Converted) ->
+ {ok, Converted}
+ end;
+ Error ->
+ Error
+ end.
+
%% Opens a driver port and converts any problems into {error, emfile}.
%% Returns {ok, Port} when successful.