From nobody Fri Jun 26 14:46:22 2026 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 4gmz5C0NfRz6jc6n for ; Fri, 26 Jun 2026 14:46:23 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmz5B6kgdz3bwr for ; Fri, 26 Jun 2026 14:46:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782485182; 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=m+42wB11nwxfYkEfbPB7nj2GDUBPQ2CqH1Ck5rSXxEQ=; b=wF7QzlYMdljFYdDrabeV7AoJv7DK6TPQfqqZ1YJALcibzuTDmeLxuS3u3aHZQP7CiohrrT AyBfcMNypfBc24mHKKdaF18nYWGFToaquN8a2mYWAsekazY9mhce68AcDkpAb2/HB996CK P/NwDDKLDpdM2Q3gOZ/9WgIKHQKH9c0ZhBxCfur6SBgsCd14LwQBhD0zHbw2PS3C1+bQes sktAUZe+SPcDTw0aKVkvLHcOG3KUzFED1n+DsK4uJ/rT89vQK7AhAmQbWTbJo8Mvafxa0M 6Dk+z6Rt0fqRfKDhPcb8S4/LzouPjn00kCW/bBqti5nGFkLSLTzZIFo42e9c/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782485182; a=rsa-sha256; cv=none; b=IspDY/XW3Jct6cKcVbTNw8tab+VRhbH2x3NlbJnUcERwKnGRDvI9MAEUDqfmOGoSfKxJ0A rdqctIKYq7shqqocyWszmrIG3QUcmt4W90IkqAho+hbmdrh97BXzSN5h1/jdtWmud3J/9G nB64xLOICyzOZQhgUcsp+sz9293oZfUrv40WBasXuecG9it5pjf/5zxf0k1VcBcbIOcMt7 Y22EVnaamBPuAymNUaEXGazjmrcAnquVOOwYlj9zDwLowFdFZEQ+NB1fM9P4FJwR5j5Ayk wJKQZbxtdJF/Vla2XRLdeNL+fepXeyrCjcWbKcFsGgrWZn/8fd1c5lmMghXYvg== 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=1782485182; 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=m+42wB11nwxfYkEfbPB7nj2GDUBPQ2CqH1Ck5rSXxEQ=; b=COKv9Y5LYbEjLx0+SXhaGEyu6APacruUu7yGp4SNa+Hs3v2OUTDHjFW0JVoIAAjgA7k2/W yDj7AWbR4+S1mt6yzkzHRO5jwpAWzYzJX4A46wYDDLykU7AU2yvR4MRkVnhZ4ZFXvsiIXo 86L1l3UpUmSZ+nmIlH+FLj7nmBjLxJDHv0n7DzhC2mxqRPlyCO0oxulGvvlBpPlGTtsgsI PZkPehcdFb3AHQbgT/ZNyOozwx+oKHcl2XWIgPpXdP+gl6ht7zq5oVBb28v5gZyC352Tsn PlOqp6eVXDZQZfcTW4a82jmdrwMi3MIZonLAMr+/qHblkdwWInPLbInoP7zeoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmz5B5595zhL9 for ; Fri, 26 Jun 2026 14:46:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ec4e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 14:46:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 8bda488114f3 - main - ping: Don't mix stdio and direct writes 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8bda488114f330d758e6741ff44882bb12b76c0d Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 14:46:22 +0000 Message-Id: <6a3e90be.1ec4e.5e534e83@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8bda488114f330d758e6741ff44882bb12b76c0d commit 8bda488114f330d758e6741ff44882bb12b76c0d Author: Dag-Erling Smørgrav AuthorDate: 2026-06-26 14:46:09 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-26 14:46:09 +0000 ping: Don't mix stdio and direct writes POSIX does not allow mixing direct writes to STDOUT_FILENO with stdio operations on stdout like we do here. More importantly, it causes tests to fail randomly (or not-so-randomly after I added an fflush in a previous commit). MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D57884 --- sbin/ping/ping.c | 25 ++++++++++++++++--------- sbin/ping/ping6.c | 27 +++++++++++++++++---------- 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 19790af083f3..362264ff2428 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -982,8 +982,10 @@ ping(int argc, char *const *argv) (void)clock_gettime(CLOCK_MONOTONIC, &last); if (ntransmitted - nreceived - 1 > nmissedmax) { nmissedmax = ntransmitted - nreceived - 1; - if (options & F_MISSED) - (void)write(STDOUT_FILENO, &BBELL, 1); + if (options & F_MISSED) { + (void)putc(BBELL, stdout); + (void)fflush(stdout); + } } } } @@ -1084,8 +1086,10 @@ pinger(void) } ntransmitted++; sntransmitted++; - if (!(options & F_QUIET) && options & F_DOT) - (void)write(STDOUT_FILENO, &DOT[DOTidx++ % DOTlen], 1); + if (!(options & F_QUIET) && options & F_DOT) { + (void)putc(DOT[DOTidx++ % DOTlen], stdout); + (void)fflush(stdout); + } } /* @@ -1207,9 +1211,10 @@ pr_pack(char *buf, ssize_t cc, struct sockaddr_in *from, struct timespec *tv) return; } - if (options & F_DOT) - (void)write(STDOUT_FILENO, &BSPACE, 1); - else { + if (options & F_DOT) { + (void)putc(BSPACE, stdout); + (void)fflush(stdout); + } else { (void)printf("%zd bytes from %s: icmp_seq=%u", cc, pr_addr(from->sin_addr), seq); (void)printf(" ttl=%d", ip.ip_ttl); @@ -1217,8 +1222,10 @@ pr_pack(char *buf, ssize_t cc, struct sockaddr_in *from, struct timespec *tv) (void)printf(" time=%.3f ms", triptime); if (dupflag) (void)printf(" (DUP!)"); - if (options & F_AUDIBLE) - (void)write(STDOUT_FILENO, &BBELL, 1); + if (options & F_AUDIBLE) { + (void)putc(BBELL, stdout); + (void)fflush(stdout); + } if (options & F_MASK) { /* Just prentend this cast isn't ugly */ (void)printf(" mask=%s", diff --git a/sbin/ping/ping6.c b/sbin/ping/ping6.c index 1a4b2472b1bd..c7221cfeae8d 100644 --- a/sbin/ping/ping6.c +++ b/sbin/ping/ping6.c @@ -1242,8 +1242,10 @@ ping6(int argc, char *argv[]) clock_gettime(CLOCK_MONOTONIC, &last); if (ntransmitted - nreceived - 1 > nmissedmax) { nmissedmax = ntransmitted - nreceived - 1; - if (options & F_MISSED) - (void)write(STDOUT_FILENO, &BBELL, 1); + if (options & F_MISSED) { + (void)putc(BBELL, stdout); + (void)fflush(stdout); + } } } } @@ -1419,8 +1421,10 @@ pinger(void) (void)printf("ping: wrote %s %d chars, ret=%d\n", hostname, cc, i); } - if (!(options & F_QUIET) && options & F_DOT) - (void)write(STDOUT_FILENO, &DOT[DOTidx++ % DOTlen], 1); + if (!(options & F_QUIET) && options & F_DOT) { + (void)putc(DOT[DOTidx++ % DOTlen], stdout); + (void)fflush(stdout); + } return(0); } @@ -1617,11 +1621,14 @@ pr_pack(u_char *buf, int cc, struct msghdr *mhdr) return; } - if (options & F_DOT) - (void)write(STDOUT_FILENO, &BSPACE, 1); - else { - if (options & F_AUDIBLE) - (void)write(STDOUT_FILENO, &BBELL, 1); + if (options & F_DOT) { + (void)putc(BSPACE, stdout); + (void)fflush(stdout); + } else { + if (options & F_AUDIBLE) { + (void)putc(BBELL, stdout); + (void)fflush(stdout); + } (void)printf("%d bytes from %s, icmp_seq=%u", cc, pr_addr(from, fromlen), seq); (void)printf(" hlim=%d", hoplim); @@ -1810,7 +1817,7 @@ pr_pack(u_char *buf, int cc, struct msghdr *mhdr) } if (!(options & F_DOT)) { - (void)putchar('\n'); + (void)putc('\n', stdout); if (options & F_VERBOSE) pr_exthdrs(mhdr); (void)fflush(stdout);