* [PATCH iproute2] ip: fix oneline output
@ 2019-11-24 16:02 Moshe Shemesh
2019-11-25 21:35 ` David Ahern
0 siblings, 1 reply; 2+ messages in thread
From: Moshe Shemesh @ 2019-11-24 16:02 UTC (permalink / raw)
To: Stephen Hemminger, David Ahern; +Cc: Jiri Pirko, netdev, Moshe Shemesh
Ip tool oneline option should output each record on a single line. While
oneline option is active the variable _SL_ replaces line feeds with the
'\' character. However, at the end of print_linkinfo() the variable _SL_
shouldn't be used, otherwise the whole output is on a single line.
Before this fix:
$ip -o link
1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN mode
DEFAULT group default qlen 1000\ link/loopback 00:00:00:00:00:00 brd
00:00:00:00:00:00\2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500
qdisc fq_codel state UP mode DEFAULT group default qlen 1000\
link/ether 52:54:00:60:0a:db brd ff:ff:ff:ff:ff:ff\3: eth1:
<BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc fq_codel state UP mode
DEFAULT group default qlen 1000\ link/ether 00:50:56:1b:05:cd brd
ff:ff:ff:ff:ff:ff\
After this fix:
$ip -o link
1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN mode
DEFAULT group default qlen 1000\ link/loopback 00:00:00:00:00:00 brd
00:00:00:00:00:00
2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc fq_codel state
UP mode DEFAULT group default qlen 1000\ link/ether 52:54:00:60:0a:db
brd ff:ff:ff:ff:ff:ff
3: eth1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc fq_codel state
UP mode DEFAULT group default qlen 1000\ link/ether 00:50:56:1b:05:cd
brd ff:ff:ff:ff:ff:ff
Fixes: 3aa0e51be64b ("ip: add support for alternative name addition/deletion/list")
Signed-off-by: Moshe Shemesh <moshe@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
---
ip/ipaddress.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index b72eb7a..da1bc44 100644
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -1155,7 +1155,7 @@ int print_linkinfo(struct nlmsghdr *n, void *arg)
close_json_array(PRINT_JSON, NULL);
}
- print_string(PRINT_FP, NULL, "%s", _SL_);
+ print_string(PRINT_FP, NULL, "%s", "\n");
fflush(fp);
return 1;
}
--
1.8.2.3
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH iproute2] ip: fix oneline output
2019-11-24 16:02 [PATCH iproute2] ip: fix oneline output Moshe Shemesh
@ 2019-11-25 21:35 ` David Ahern
0 siblings, 0 replies; 2+ messages in thread
From: David Ahern @ 2019-11-25 21:35 UTC (permalink / raw)
To: Moshe Shemesh, Stephen Hemminger; +Cc: Jiri Pirko, netdev
On 11/24/19 9:02 AM, Moshe Shemesh wrote:
> Ip tool oneline option should output each record on a single line. While
> oneline option is active the variable _SL_ replaces line feeds with the
> '\' character. However, at the end of print_linkinfo() the variable _SL_
> shouldn't be used, otherwise the whole output is on a single line.
>
...
>
> Fixes: 3aa0e51be64b ("ip: add support for alternative name addition/deletion/list")
> Signed-off-by: Moshe Shemesh <moshe@mellanox.com>
> Reviewed-by: Jiri Pirko <jiri@mellanox.com>
> ---
> ip/ipaddress.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>
applied to iproute2-next. Thanks
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-11-25 21:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-24 16:02 [PATCH iproute2] ip: fix oneline output Moshe Shemesh
2019-11-25 21:35 ` David Ahern
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).