From nobody Mon Apr 28 18:21:12 2025 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 4ZmWwn3VSNz5thSM; Mon, 28 Apr 2025 18:21: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZmWwm5MM6z3YW2; Mon, 28 Apr 2025 18:21:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745864472; 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=R/zsRkPhqa4viI7kLT5SP4/Vc+UPrYz7VX+7LMcgTQg=; b=VDCNGN2RCSA1MTmAYgdsFUIPrJTfJ2SXtM+FI8UZIDkiyTtOZf52vKpi6U3AIgHygi9ViI 2sAo17v5nge7FtTAF8vhjytZYhCqjR4nNMuZfWkrkcJzgA9sYZN1AHR4B37mS5cHUVgeT3 iCd9pUTpwySgcCaW+EWH/MDPkwqsj2s9ZbB8EH05eoz+Cch/yMVc6XU22iBvd5lW5z0ueJ Yd7mHpxhWTfD1no8Rbxv3iWuCGl4WOzZB5SAQV7UWw3nI4QI6SDrZZO2AHHE5dyOQJJSjo 9q0IlSifl+36tv8ZJYAqEuz3KW6/qKHT2oGWTuWwckC+hfoMMgCNIbyEYoC50g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745864472; a=rsa-sha256; cv=none; b=X9/yjsidMezzIVtM480dGWrGb3bAdZ4yEeVZfGMg4kR2C8SPETs0D/xFIODpEuLIq+lxyV gww82MgvIZjoT2s0skm4UCl6iLdHNfdsJs79OuzqCeTsAf2j+TddxhszyI0OTC69yAJL/D cemya2Mv/70/402f0w2fTXkw81byNGoOTj02lw9cVSOXYeGS6/XU1+PMuOipS6dX4Yk75F m7nCNQp7adp3Vl6tLb+Gbgg/SZ/VODoEEg6wBcz/8IpT7Ju02svPwfvrHbhtFRbgQB8Z8S UTRq+fwFsUrmqMVEJX7BxpNlGUqy7G3Wi7FQYtv4VOAg0oMwta4xUlnJS8SZWw== 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=1745864472; 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=R/zsRkPhqa4viI7kLT5SP4/Vc+UPrYz7VX+7LMcgTQg=; b=cZuruOev5XhQ2qp+Um9dDaZfYX2CmUbX2a82sc0ODzE0qqJ42ZBPKLA3WVEWqnNiPymFAz ZspwJ/I3Wk1pKPYz2oTWWMwXPiE0KipucJgJCQfBkGXU/b+1mAwYkwSQXBcDRloMj81EwF zzsRiVTuYSfYJxSnoTuKCUjwb1wiEMroGjuzGO+bywWx42H09mfW7eWoZa+h19ocumdFGP PVRHTho042c8/1OVSv7HipDpQzc6M5XlKP50sRnF3lw6yX37Lkum6+Tpop5jpEEJubq0jD 6kIrw/JvuZBXxoUtGpYHqRLSCXOsndUS5q1LIOUnPFrHX+Khs3Oz9nxvdqT7vg== 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 4ZmWwm3dVtzmGW; Mon, 28 Apr 2025 18:21:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53SILCAs093172; Mon, 28 Apr 2025 18:21:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53SILC86093169; Mon, 28 Apr 2025 18:21:12 GMT (envelope-from git) Date: Mon, 28 Apr 2025 18:21:12 GMT Message-Id: <202504281821.53SILC86093169@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: c97460c4d97d - main - sysrc: Fix check flag logic for append and subtract 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: c97460c4d97db1bd46dab9f2bdbc90cd1ed7757f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c97460c4d97db1bd46dab9f2bdbc90cd1ed7757f commit c97460c4d97db1bd46dab9f2bdbc90cd1ed7757f Author: Michal Scigocki AuthorDate: 2025-04-14 07:01:06 +0000 Commit: Mark Johnston CommitDate: 2025-04-28 18:18:08 +0000 sysrc: Fix check flag logic for append and subtract When using sysrc with the check flag (-c), the append (+=) and subtract (-=) operations result in incorrect return values because on the check path the necessary union/difference calculation logic is not performed. However, the correct union/difference calculation is already performed when running without the check flag. We fix the issue on the check path by using the results from the existing union/difference calculation in the check logic to get the correct return values. PR: 279200 Reviewed by: markj MFC after: 1 month Pull Request: https://github.com/freebsd/freebsd-src/pull/1664 --- usr.sbin/sysrc/sysrc | 52 +++++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/usr.sbin/sysrc/sysrc b/usr.sbin/sysrc/sysrc index 1766cf7ab835..625ff5ca4efd 100644 --- a/usr.sbin/sysrc/sysrc +++ b/usr.sbin/sysrc/sysrc @@ -764,33 +764,6 @@ while [ $# -gt 0 ]; do continue fi - # - # If `-c' is passed, simply compare and move on - # - if [ "$CHECK_ONLY" ]; then - if ! IGNORED=$( f_sysrc_get "$NAME?" ); then - status=$FAILURE - [ "$VERBOSE" ] && - echo "$NAME: not currently set" - shift 1 - continue - fi - value=$( f_sysrc_get "$NAME" ) - if [ "$value" != "${1#*=}" ]; then - status=$FAILURE - if [ "$VERBOSE" ]; then - echo -n "$( f_sysrc_find "$NAME" ): " - echo -n "$NAME: would change from " - echo "\`$value' to \`${1#*=}'" - fi - elif [ "$VERBOSE" ]; then - echo -n "$( f_sysrc_find "$NAME" ): " - echo "$NAME: already set to \`$value'" - fi - shift 1 - continue - fi - # # Determine both `before' value and appropriate `new' value # @@ -848,6 +821,31 @@ while [ $# -gt 0 ]; do new="${1#*=}" esac + # + # If `-c' is passed, simply compare and move on + # + if [ "$CHECK_ONLY" ]; then + if ! IGNORED=$( f_sysrc_get "$NAME?" ); then + status=$FAILURE + [ "$VERBOSE" ] && + echo "$NAME: not currently set" + shift 1 + continue + elif [ "$new" != "$before" ]; then + status=$FAILURE + if [ "$VERBOSE" ]; then + echo -n "$( f_sysrc_find "$NAME" ): " + echo -n "$NAME: would change from " + echo "\`$before' to \`$new'" + fi + elif [ "$VERBOSE" ]; then + echo -n "$( f_sysrc_find "$NAME" ): " + echo "$NAME: already set to \`$before'" + fi + shift 1 + continue + fi + # # If `-N' is passed, simplify the output #