From nobody Mon Nov 06 16:45:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPHKW6kW7z50F41; Mon, 6 Nov 2023 16:45:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPHKW55zKz4Glp; Mon, 6 Nov 2023 16:45:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BE2fUnWw8v/FROjPz3YJNOLYkAUrlN97dCSx7zfykbc=; b=M0vAJWcUrDi40vzRs6QF1LGQY9BaIGA33GFpO1x9VYNqf4nxk0JJJWNY8Q/tvR9YgrExPl lU0vl7NzQwz49Krwr4sx7R9RG/6u/jY/FVQk1nVDVK0e2d2LFBFXOzja5T0Je2itriL/L5 ruZPoUAgaPq8DCXUq5OlXeEMAjkp2NRC4bxblTOTrnn3byD2zmJY77BnKW6bmtFeKJxZL0 E1ecetIQbchLHjLOhuhnifJVIsTDdxrm61MBVgXmt6fbpRfYoe1lyDfzA/SimN8yKZI3oc 9IMaWPCKyc06DH4wHHEZLQ47rvTI8T0LucUhQuttD+UpT4mAu/rOu6q0Tz1x2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BE2fUnWw8v/FROjPz3YJNOLYkAUrlN97dCSx7zfykbc=; b=W1zeGoEW1nLIfRtxU9VgSK5MCHN/W41EYHRymcjGPmQnCd+aOKS5EBdI48B7bSZfmcLjSO uRFvMCwB31Mj2TxMRdYZco8coMuSkOQ3L2Wg2uARtFM7t6eHySYXjChmhy8M1sSJCcwZTt U4nyJkMDIlWu1HSG6L/Fm8gIiTupeI+XcupSLlUNPL3xzpStVE47h8ivEvzYydEQTLsXtm 1HR7GkJfTGuOMGuTgGNMtO3cFadTP6KtQPmoP2urLSYdIrbz6vQDKK4zcVXM3kzmnkV53S wS0dM/jSpBVsaRsRgH742s4vlHYuwUVcykDvOIiq6YdDPDMAq4vgjAej81dLfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699289151; a=rsa-sha256; cv=none; b=wUSondDxeDABLu8N4KZcb8l8VztrYY3vFhWvptO0ReBTsyk9LNncmKjHFGHLucvoQ+v+UH cyhj/kaRPQWRVQ0Q9bNhoBBD+ltJBto207Cxs8pUHNcyujPQkPb7Q1ciSzpKzJ2KspHaov gp8aev51KWQhemfFxcTK3EeaXMZsAUG5RMt/r/gA2Zj8ZwoycFRgTMGTwW8CIqNQAkCVXP aghQUIX/WsRIIC/oas2dQh+OsbCwRHp2walS1XADpIYBjJw4Gix2eS/acGP1GuT0UFLVGO I+vNcK1FwOXuhoiFsVSQW0ynZyaDspeK6xW1BMPa3EBB+1HKUJu5hofgMe9iNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPHKW4CqJzVp; Mon, 6 Nov 2023 16:45:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6GjpNb058334; Mon, 6 Nov 2023 16:45:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6GjpWP058331; Mon, 6 Nov 2023 16:45:51 GMT (envelope-from git) Date: Mon, 6 Nov 2023 16:45:51 GMT Message-Id: <202311061645.3A6GjpWP058331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b0da2a3fa145 - stable/14 - ping: Remove an extra new line character List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b0da2a3fa1458b5cf404edc868b3014bd8825ed7 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b0da2a3fa1458b5cf404edc868b3014bd8825ed7 commit b0da2a3fa1458b5cf404edc868b3014bd8825ed7 Author: Jose Luis Duran AuthorDate: 2023-02-09 18:16:39 +0000 Commit: Mark Johnston CommitDate: 2023-11-06 16:45:43 +0000 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 (cherry picked from commit d2c9a140547acf1bfe3a233ef15cf971be93e14d) --- sbin/ping/ping.c | 2 +- sbin/ping/tests/test_ping.py | 2 -- 2 files changed, 1 insertion(+), 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 93d45a1e3d7b..8d3bd115e2a6 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