From nobody Tue Jan 30 20:23:12 2024 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 4TPc7513LDz59V3G; Tue, 30 Jan 2024 20:23:13 +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 4TPc750RXzz4h3R; Tue, 30 Jan 2024 20:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706646193; 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=iC4pBz9l2wp0NVCpXQl2r/je34yp8mWMXjuLAGBVa7g=; b=uZumvC/ENxPuNC6iI9GbvW5MDQqjb79lq7jUxHuSiUo4rmZrrt/wb+kDKeOtUFZsyXZHg3 BV3OGMrZsMnyQXcPdCp1VFMBZpEJG+QIUncDlMIZVIJvScg0IU5msbWwg7eaZGChgWf1WY PQVxzxZybGmKHzTpty5nvPEj+PjESnfj8biz+xSvjnQ1WV1k/2eX2OXhnZvBtESXjP6Vx3 lPkzTykAc/0t3ASgO/1AOmLbBUybNIfbZTIF5ZG/R161q4Kj3YrIZSzcuMOrDIcQ8zq9G8 uO0bOsQX1obGBeG1ViF50cAtOdWReq+sz4oLgDO3D6oSCAagmHjW1hIVr8bM/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706646193; 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=iC4pBz9l2wp0NVCpXQl2r/je34yp8mWMXjuLAGBVa7g=; b=OwyyRjNz8f4GL9A3e7Ov8bebC6XNMusRYy/1yYE0DcP/6oTHfyM9bGCKNRxvHrV8WxpY6z 9Gn73MU5VCWSEBBP+aEpISEnTqcqa6sV7838OfHTqHZywVbWxsFgygEJkiQ+P3eA5Q7Xf7 duGaxK5lFSIi17Pv1PdPfmOx0U6fL5WGQI3aD/gTLPjHpQekFoVQvMRb87KsbdYOMpfLku U4SrKCk+Pw+XpJEAH/SrvjpGx1ku4NE2UdEXdG6NtAGt3xIHTUNkS9cTc78g4RoWfsGRJM /uxi8aLQqNZQ/31PqLduRnaNn4AFRLU+AoTZYHtY6piJTQKClaN4LCeLkRv8ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706646193; a=rsa-sha256; cv=none; b=Vv0zHOHUcqvz7YxNa86WXxr+Qnp4fopiR3CsV4XLAag17FeKoor1Au70gp7XfWDj1iQZH0 gETu5IyEposf+y0qTSvcZYB25mr4tJCoTKxCLVrnIrgYvbW8Wq/VGqepVX2U5KQAYTm0a4 FzaJScR+aIRyWTRRHxV0Jql1aADxBVUGqMPoBDIbMaYNhO/pxfjrWRCJ7Iy2wUa7n8hOCL cBAJKOY6hPWZaSDe+KNm5pSv+SGGb+mfmqCrWInyEC66ygo+0ABOh3iCbJEepseuE1L8lp QQgeWQiVJCtk7NHBpoRChT5K5DAoCf4Hgvy8OlOOOFObZDIZcSUElZLFJBvNuQ== 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 4TPc746bNnzqfH; Tue, 30 Jan 2024 20:23:12 +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 40UKNCsd020389; Tue, 30 Jan 2024 20:23:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UKNCv4020386; Tue, 30 Jan 2024 20:23:12 GMT (envelope-from git) Date: Tue, 30 Jan 2024 20:23:12 GMT Message-Id: <202401302023.40UKNCv4020386@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2954af09f143 - main - chflags(1): obey siginfo request on chflagsat(2) failure 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2954af09f143ed1e484f7ca520e0d2611101e248 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2954af09f143ed1e484f7ca520e0d2611101e248 commit 2954af09f143ed1e484f7ca520e0d2611101e248 Author: Konstantin Belousov AuthorDate: 2024-01-30 18:07:59 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-30 20:21:55 +0000 chflags(1): obey siginfo request on chflagsat(2) failure Note that the error diagnostic can now be printed both to stderr due to the absence of the -f flag and to stdout due to SIGINFO simultaneously. Noted and reviewed by: jrtc27 Sponsored by: The FreeBSD Foundation MFC after: 1 week --- bin/chflags/chflags.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c index 0972240558df..a78ebbfd471d 100644 --- a/bin/chflags/chflags.c +++ b/bin/chflags/chflags.c @@ -61,7 +61,7 @@ main(int argc, char *argv[]) u_long clear, newflags, set; long val; int Hflag, Lflag, Rflag, fflag, hflag, vflag, xflag; - int ch, fts_options, oct, rval; + int ch, e, fts_options, oct, rval; char *flags, *ep; Hflag = Lflag = Rflag = fflag = hflag = vflag = xflag = 0; @@ -183,10 +183,16 @@ main(int argc, char *argv[]) continue; if (chflagsat(AT_FDCWD, p->fts_accpath, newflags, atflag) == -1) { + e = errno; if (!fflag) { - warn("%s", p->fts_path); + warnc(e, "%s", p->fts_path); rval = 1; } + if (siginfo) { + (void)printf("%s: %s\n", p->fts_path, + strerror(e)); + siginfo = 0; + } } else if (vflag || siginfo) { (void)printf("%s", p->fts_path); if (vflag > 1 || siginfo)