jacob.eva
/
ejabberd-contrib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mod_http_upload: Strip newline from command output 

The list_to_integer/1 function doesn't cope with trailing newline
characters.
This commit is contained in:
Holger Weiss 2015-10-26 22:10:32 +01:00
parent f6b66cd130
commit d29795fb24
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod_http_upload/src/mod_http_upload.erl
View File

@ -840,7 +840,7 @@ code_to_message(_Code) -> <<"">>.
identify(Path) -> identify(Path) ->
Cmd = lists:flatten(io_lib:fwrite("identify -format \"ok %m %h %w\" ~s", Cmd = lists:flatten(io_lib:fwrite("identify -format \"ok %m %h %w\" ~s",
[Path])), [Path])),
Res = os:cmd(Cmd), Res = string:strip(os:cmd(Cmd), right, $\n),
case string:tokens(Res, " ") of case string:tokens(Res, " ") of
["ok", T, H, W] -> ["ok", T, H, W] ->
{ok, #media_info{ {ok, #media_info{
@ -871,7 +871,7 @@ convert(Path, #media_info{type = T, width = W, height = H}) ->
{ok, OutPath}; {ok, OutPath};
Err -> Err ->
?ERROR_MSG("failed to convert ~s to ~s: ~s", ?ERROR_MSG("failed to convert ~s to ~s: ~s",
[Path, OutPath, Err]), [Path, OutPath, string:strip(Err, right, $\n)]),
pass pass
end; end;
true -> true ->