diff options
| author | Björn Gustavsson <[email protected]> | 2013-02-05 12:24:12 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-02-11 14:09:27 +0100 |
| commit | 066c26ec53012ccea106a4f27b85ddbdb58bb2bc (patch) | |
| tree | b5917b3720c80e0a9c58af4f1e6b02201edaa0e3 | |
| parent | 43093a22099f6b0ec33970163a40f42a6b70b978 (diff) | |
| download | otp-066c26ec53012ccea106a4f27b85ddbdb58bb2bc.tar.gz otp-066c26ec53012ccea106a4f27b85ddbdb58bb2bc.tar.bz2 otp-066c26ec53012ccea106a4f27b85ddbdb58bb2bc.zip | |
prim_file: Refactor functions that return filenames
| -rw-r--r-- | erts/preloaded/src/prim_file.erl | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl index e1d42a4b9a..af1a6127c9 100644 --- a/erts/preloaded/src/prim_file.erl +++ b/erts/preloaded/src/prim_file.erl @@ -656,7 +656,8 @@ get_cwd_int(Drive) -> get_cwd_int({?DRV, [binary]}, Drive). get_cwd_int(Port, Drive) -> - drv_command(Port, <<?FILE_PWD, Drive>>). + drv_command(Port, <<?FILE_PWD, Drive>>, + fun handle_fname_response/1). @@ -764,7 +765,8 @@ altname(Port, File) when is_port(Port) -> altname_int(Port, File). altname_int(Port, File) -> - drv_command(Port, [?FILE_ALTNAME, pathname(File)]). + drv_command(Port, [?FILE_ALTNAME, pathname(File)], + fun handle_fname_response/1). %% write_file_info/{2,3,4} @@ -857,7 +859,8 @@ read_link(Port, Link) when is_port(Port) -> read_link_int(Port, Link). read_link_int(Port, Link) -> - drv_command(Port, [?FILE_READLINK, pathname(Link)]). + drv_command(Port, [?FILE_READLINK, pathname(Link)], + fun handle_fname_response/1). @@ -927,7 +930,13 @@ list_dir_convert([]) -> []. %%%----------------------------------------------------------------- %%% Functions to communicate with the driver - +handle_fname_response(Port) -> + case drv_get_response(Port) of + {fname, Name} -> + {ok, prim_file:internal_native2name(Name)}; + Error -> + Error + end. %% Opens a driver port and converts any problems into {error, emfile}. %% Returns {ok, Port} when successful. @@ -1202,8 +1211,8 @@ translate_response(?FILE_RESP_N2DATA = X, L0) when is_list(L0) -> end; translate_response(?FILE_RESP_EOF, []) -> eof; -translate_response(?FILE_RESP_FNAME, Data) when is_binary(Data) -> - {ok, prim_file:internal_native2name(Data)}; +translate_response(?FILE_RESP_FNAME, Data) -> + {fname, Data}; translate_response(?FILE_RESP_LFNAME, Data) -> {lfname, Data}; translate_response(?FILE_RESP_ALL_DATA, Data) -> |