diff options
author | Jose Luis Duran <jlduran@gmail.com> | 2023-02-09 18:16:39 +0000 |
---|---|---|
committer | Mark Johnston <markj@FreeBSD.org> | 2023-10-11 17:48:27 +0000 |
commit | d2c9a140547acf1bfe3a233ef15cf971be93e14d (patch) | |
tree | 17aebe1b6ccf13602da8e394a756432624823be2 | |
parent | 20012a3a1a045bfe02bb64063cf0aba4d82471cb (diff) | |
download | src-d2c9a140547acf1bfe3a233ef15cf971be93e14d.tar.gz src-d2c9a140547acf1bfe3a233ef15cf971be93e14d.zip |
ping: Remove an extra new line character
This matches the behavior when an RR truncated route is printed.
Reviewed by: markj
MFC after: 1 week
Pull Request: https://github.com/freebsd/freebsd-src/pull/863
Differential Revision: https://reviews.freebsd.org/D39485
-rw-r--r-- | sbin/ping/ping.c | 2 | ||||
-rw-r--r-- | sbin/ping/tests/test_ping.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index f67d85f30a5d..848ffbbb7c76 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1406,7 +1406,7 @@ pr_pack(char *buf, ssize_t cc, struct sockaddr_in *from, struct timespec *tv) (void)putchar('\n'); } } else - (void)printf("\t(truncated route)\n"); + (void)printf("\t(truncated route)"); break; case IPOPT_RR: j = cp[IPOPT_OLEN]; /* get length */ diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py index c311a77d6bb8..1c2540cb6d15 100644 --- a/sbin/ping/tests/test_ping.py +++ b/sbin/ping/tests/test_ping.py @@ -859,7 +859,6 @@ PING 192.0.2.2 (192.0.2.2): 56 data bytes 64 bytes from: icmp_seq=0 ttl= time= ms LSRR: (truncated route) - --- 192.0.2.2 ping statistics --- 1 packets transmitted, 1 packets received, 0.0% packet loss round-trip min/avg/max/stddev = /// ms @@ -916,7 +915,6 @@ PING 192.0.2.2 (192.0.2.2): 56 data bytes 64 bytes from: icmp_seq=0 ttl= time= ms SSRR: (truncated route) - --- 192.0.2.2 ping statistics --- 1 packets transmitted, 1 packets received, 0.0% packet loss round-trip min/avg/max/stddev = /// ms |