From nobody Wed Oct 11 18:01:04 2023 X-Original-To: dev-commits-src-main@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 4S5LDJ6fNhz4wTtH; Wed, 11 Oct 2023 18:01:04 +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 4S5LDJ4JDrz4PQG; Wed, 11 Oct 2023 18:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697047264; 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=RRKFYyypGPRR0pYsz8fWltgpd38oFI1EWYB9240p9Uk=; b=hNqajDL6qgsmLL6nQsLyIO0NhT8duUF8ettoDx7fnx6VSeF+CDMjiMEhAygKY/YHXLxOGC PNoGpiZmfWNbmR+lv1w5JO3Akmq8FVxHDw0Xswce3mPrvouu1vFxPWCmBTyg8TUmbHdN3L hTGoNxxTaK+ssVmg7C5GQgdcbqWHKlTX+1WT6IWUWwW9fZzD5vZVpIEW5JFEwQIz1OqxAD b3RAlOmhu+uwkvSyLYiHGGw3yAN+wVV2PbpPk4CFfD9YPSU2l6IKqVXtjRGq4O4meA1SeR DZQNSOt1soYO2nvnIV33T6r7xmxKrZ7oQEbzJ8KdTu/XixgN9pHBB/yPHEn3FA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697047264; a=rsa-sha256; cv=none; b=qMt4qCEkddQdahWcwsc8Uk+3/Xcy0L7wdBVa9HIo2zrT8uxKFW4SotZOwbtOvhoiCunni2 XqDqbgC17+tJWcWmYkUQThckaKkx+Qlds0JQ07tZPNAdMksZ7ug1eES8KnrkY2QKIXxwEe Hkp0pe8OxoJz3mV+/tDkGMEZZesn/ptjUKj77MsBKdyctI7gad7inidGSg47xDJZodatmb O7A57Ovx2VC00VIelFB60Vs7FyLV0opirAw7ePqovuMVkAW3Jh2HK3rjb4o21HqTKcILFf bMtbeBjPJiRaEYC2FS1Fray0RJ73EsDCf4oYvygQk7qf5G0zp1i8BVrD1il3sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697047264; 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=RRKFYyypGPRR0pYsz8fWltgpd38oFI1EWYB9240p9Uk=; b=dBRayfkILtsi3U6fSyiFOguQpjNA+5Q1m2o7nVzTpCxpdhe4ay8PU4AleRazD12LbmF2Uf 8LqLtQLvjjujCHj5kmVrY3JF0AKCsQRRiO7x3HNIA5iv3go4s395AUi7udKsH4F2e9Xn50 7QjcUOOHUlPMYQKVzi4ZH7N03bPJVVTF57Khud0vs1UHUWWizHpvShy1OvdeURaDD7MmAm IdmbtZxveysK1vJZMqkS1Z/nBcBCD2YxUewBWtg11n13zviYJcKalyeeapUYDEUnGfqg+5 hPAh8U+hmNAvzmLYm4I0U1XctMqI/POfcMLQj6cxjgv5uh1k5dagvYjgG3NnTw== 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 4S5LDJ3CqLzWNZ; Wed, 11 Oct 2023 18:01:04 +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 39BI14e9053715; Wed, 11 Oct 2023 18:01:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BI144H053712; Wed, 11 Oct 2023 18:01:04 GMT (envelope-from git) Date: Wed, 11 Oct 2023 18:01:04 GMT Message-Id: <202310111801.39BI144H053712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d2c9a140547a - main - ping: Remove an extra new line character List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d2c9a140547acf1bfe3a233ef15cf971be93e14d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d2c9a140547acf1bfe3a233ef15cf971be93e14d commit d2c9a140547acf1bfe3a233ef15cf971be93e14d Author: Jose Luis Duran AuthorDate: 2023-02-09 18:16:39 +0000 Commit: Mark Johnston CommitDate: 2023-10-11 17:48:27 +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 --- 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 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