diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-02-22 15:30:29 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-02-22 15:30:29 +0100 |
| commit | 17231ca24cbf3b136301f1076bb94247344e9f35 (patch) | |
| tree | 5ef0821c9294e8fbd40dab188980f5b8393116d3 | |
| parent | f1d328bdbc58e2ad0325c11edb3bfa0db50b84c3 (diff) | |
| parent | ba1902911b675e1edf2e941a4df327f6e312b364 (diff) | |
| download | otp-17231ca24cbf3b136301f1076bb94247344e9f35.tar.gz otp-17231ca24cbf3b136301f1076bb94247344e9f35.tar.bz2 otp-17231ca24cbf3b136301f1076bb94247344e9f35.zip | |
Merge branch 'sal/ftp/OTP-10886'
* sal/ftp/OTP-10886:
Changed to correct errorcode in testcase
Handle correctly the "No files found or file unavailable" error code.
| -rw-r--r-- | lib/inets/src/ftp/ftp.erl | 4 | ||||
| -rw-r--r-- | lib/inets/src/ftp/ftp_response.erl | 3 | ||||
| -rw-r--r-- | lib/inets/test/ftp_format_SUITE.erl | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/lib/inets/src/ftp/ftp.erl b/lib/inets/src/ftp/ftp.erl index fe25c23316..132a384a49 100644 --- a/lib/inets/src/ftp/ftp.erl +++ b/lib/inets/src/ftp/ftp.erl @@ -1899,6 +1899,10 @@ ctrl_result_response(pos_compl, #state{client = From} = State, _) -> gen_server:reply(From, ok), {noreply, State#state{client = undefined, caller = undefined}}; +ctrl_result_response(enofile, #state{client = From} = State, _) -> + gen_server:reply(From, {error, enofile}), + {noreply, State#state{client = undefined, caller = undefined}}; + ctrl_result_response(Status, #state{client = From} = State, _) when (Status =:= etnospc) orelse (Status =:= epnospc) orelse diff --git a/lib/inets/src/ftp/ftp_response.erl b/lib/inets/src/ftp/ftp_response.erl index faeacb31ab..364f534737 100644 --- a/lib/inets/src/ftp/ftp_response.erl +++ b/lib/inets/src/ftp/ftp_response.erl @@ -162,6 +162,7 @@ error_string(epath) -> "No such file or directory, already exists, " error_string(etype) -> "No such type."; error_string(euser) -> "User name or password not valid."; error_string(etnospc) -> "Insufficient storage space in system."; +error_string(enofile) -> "No files found or file unavailable"; error_string(epnospc) -> "Exceeded storage allocation " "(for current directory or dataset)."; error_string(efnamena) -> "File name not allowed."; @@ -180,6 +181,8 @@ interpret_status(?POS_COMPL,_,_) -> pos_compl; interpret_status(?POS_INTERM,?AUTH_ACC,2) -> pos_interm_acct; %% Positive Intermediate Reply interpret_status(?POS_INTERM,_,_) -> pos_interm; +%% No files found or file not available +interpret_status(?TRANS_NEG_COMPL,?FILE_SYSTEM,0) -> enofile; %% No storage area no action taken interpret_status(?TRANS_NEG_COMPL,?FILE_SYSTEM,2) -> etnospc; %% Temporary Error, no action taken diff --git a/lib/inets/test/ftp_format_SUITE.erl b/lib/inets/test/ftp_format_SUITE.erl index cbc1b04bbb..02b9000dd9 100644 --- a/lib/inets/test/ftp_format_SUITE.erl +++ b/lib/inets/test/ftp_format_SUITE.erl @@ -273,7 +273,7 @@ ftp_other_status_codes(Config) when is_list(Config) -> %% 4XX {trans_neg_compl, _ } = ftp_response:interpret("421 Foobar\r\n"), {trans_neg_compl, _ } = ftp_response:interpret("426 Foobar\r\n"), - {trans_neg_compl, _ } = ftp_response:interpret("450 Foobar\r\n"), + {enofile, _ } = ftp_response:interpret("450 Foobar\r\n"), {trans_neg_compl, _ } = ftp_response:interpret("451 Foobar\r\n"), {etnospc, _ } = ftp_response:interpret("452 Foobar\r\n"), |