Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
forks
lager
Commits
d416dc0a
Commit
d416dc0a
authored
12 years ago
by
Andrew Thompson
Browse files
Options
Download
Email Patches
Plain Diff
Fix escaped char printing in ~p mode, reported by @etrepum
parent
7815a88c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/lager_trunc_io.erl
+23
-6
src/lager_trunc_io.erl
with
23 additions
and
6 deletions
+23
-6
src/lager_trunc_io.erl
View file @
d416dc0a
...
...
@@ -62,7 +62,7 @@ format(Fmt, Args, Max) ->
format
(
Fmt
,
Args
,
Max
,
Options
)
->
try
lager_format
:
format
(
Fmt
,
Args
,
Max
,
Options
)
catch
_
:_
->
_
What
:_
Why
->
erlang
:
error
(
badarg
,
[
Fmt
,
Args
])
end
.
...
...
@@ -282,7 +282,7 @@ alist_start([H|T], Max, Options) when is_integer(H), H >= 16#20, H =< 16#7e ->
{
R
,
Len
}
=
list_body
([
H
|
T
],
Max
-
2
,
Options
,
false
),
{[
$[
,
R
,
$]
],
Len
+
2
}
end
;
alist_start
([
H
|
T
],
Max
,
Options
)
when
H
=:=
9
;
H
=:=
10
;
H
=:=
13
->
alist_start
([
H
|
T
],
Max
,
Options
)
when
H
=:=
$\t
;
H
=:=
$\n
;
H
=:=
$\r
;
H
=:=
$\v
;
H
=:=
$\e
;
H
=:=
$\f
;
H
=:=
$\b
->
try
alist
([
H
|
T
],
Max
-
1
,
Options
)
of
{
L
,
Len
}
->
{[
$"
|
L
],
Len
+
1
}
...
...
@@ -299,10 +299,14 @@ alist([], _Max, #print_options{force_strings=true}) -> {"", 0};
alist
([],
_
Max
,
_
Options
)
->
{
"
\"
"
,
1
};
alist
(_,
Max
,
#print_options
{
force_strings
=
true
})
when
Max
<
4
->
{
"..."
,
3
};
alist
(_,
Max
,
#print_options
{
force_strings
=
false
})
when
Max
<
5
->
{
"...
\"
"
,
4
};
alist
([
H
|
T
],
Max
,
Options
=
#print_options
{
force_strings
=
false
,
lists_as_strings
=
true
})
when
H
=:=
$"
;
H
=:=
$\\
->
%% preserve escaping around quotes
{
L
,
Len
}
=
alist
(
T
,
Max
-
1
,
Options
),
{[
$\\
,
H
|
L
],
Len
+
2
};
alist
([
H
|
T
],
Max
,
Options
)
when
is_integer
(
H
),
H
>=
16#20
,
H
=<
16#7e
->
% definitely printable
{
L
,
Len
}
=
alist
(
T
,
Max
-
1
,
Options
),
{[
H
|
L
],
Len
+
1
};
alist
([
H
|
T
],
Max
,
Options
)
when
H
=:=
9
;
H
=:=
10
;
H
=:=
13
->
alist
([
H
|
T
],
Max
,
Options
)
when
H
=:=
$\t
;
H
=:=
$\n
;
H
=:=
$\r
;
H
=:=
$\v
;
H
=:=
$\e
;
H
=:=
$\f
;
H
=:=
$\b
->
{
L
,
Len
}
=
alist
(
T
,
Max
-
1
,
Options
),
case
Options
#print_options.force_strings
of
true
->
...
...
@@ -349,9 +353,12 @@ dec_depth(#print_options{depth=Depth} = Options) when Depth > 0 ->
dec_depth
(
Options
)
->
Options
.
escape
(
9
)
->
"
\\
t"
;
escape
(
10
)
->
"
\\
n"
;
escape
(
13
)
->
"
\\
r"
.
escape
(
$\t
)
->
"
\\
t"
;
escape
(
$\n
)
->
"
\\
n"
;
escape
(
$\r
)
->
"
\\
r"
;
escape
(
$\e
)
->
"
\\
e"
;
escape
(
$\f
)
->
"
\\
f"
;
escape
(
$\b
)
->
"
\\
b"
.
-
ifdef
(
TEST
).
%%--------------------
...
...
@@ -470,6 +477,16 @@ binary_printing_test() ->
?
assertEqual
(
"hello"
,
lists
:
flatten
(
format
(
"
~s
"
,
[
<<
"hello"
>>
],
50
))),
?
assertEqual
(
"hello
\n
world"
,
lists
:
flatten
(
format
(
"
~s
"
,
[
<<
"hello
\n
world"
>>
],
50
))),
?
assertEqual
(
"<<
\"
hello
\\
nworld
\"
>>"
,
lists
:
flatten
(
format
(
"
~p
"
,
[
<<
"hello
\n
world"
>>
],
50
))),
?
assertEqual
(
"<<
\"\\\"
hello world
\\\"\"
>>"
,
lists
:
flatten
(
format
(
"
~p
"
,
[
<<
"
\"
hello world
\"
"
>>
],
50
))),
?
assertEqual
(
"<<
\"
hello
\\\\
world
\"
>>"
,
lists
:
flatten
(
format
(
"
~p
"
,
[
<<
"hello
\\
world"
>>
],
50
))),
?
assertEqual
(
"<<
\"
hello
\\\\
\
world
\"
>>"
,
lists
:
flatten
(
format
(
"
~p
"
,
[
<<
"hello
\\
\
world"
>>
],
50
))),
?
assertEqual
(
"<<
\"
hello
\\\\\\\\
world
\"
>>"
,
lists
:
flatten
(
format
(
"
~p
"
,
[
<<
"hello
\\\\
world"
>>
],
50
))),
?
assertEqual
(
"<<
\"
hello
\\
bworld
\"
>>"
,
lists
:
flatten
(
format
(
"
~p
"
,
[
<<
"hello
\b
world"
>>
],
50
))),
?
assertEqual
(
"<<
\"
hello
\\
tworld
\"
>>"
,
lists
:
flatten
(
format
(
"
~p
"
,
[
<<
"hello
\t
world"
>>
],
50
))),
?
assertEqual
(
"<<
\"
hello
\\
nworld
\"
>>"
,
lists
:
flatten
(
format
(
"
~p
"
,
[
<<
"hello
\n
world"
>>
],
50
))),
?
assertEqual
(
"<<
\"
hello
\\
rworld
\"
>>"
,
lists
:
flatten
(
format
(
"
~p
"
,
[
<<
"hello
\r
world"
>>
],
50
))),
?
assertEqual
(
"<<
\"
hello
\\
eworld
\"
>>"
,
lists
:
flatten
(
format
(
"
~p
"
,
[
<<
"hello
\e
world"
>>
],
50
))),
?
assertEqual
(
"<<
\"
hello
\\
fworld
\"
>>"
,
lists
:
flatten
(
format
(
"
~p
"
,
[
<<
"hello
\f
world"
>>
],
50
))),
?
assertEqual
(
" hello"
,
lists
:
flatten
(
format
(
"
~10s
"
,
[
<<
"hello"
>>
],
50
))),
ok
.
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment