From nobody Tue Feb 24 14:26:04 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 4fL0Q506bvz6S9wT for ; Tue, 24 Feb 2026 14:26:05 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL0Q46jPnz3T7g for ; Tue, 24 Feb 2026 14:26:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771943164; 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=+qPrg7naIr2VU+Zeg4F3ADs8OyeUybPYPvjp5OyAmjA=; b=LkqwVYwqXf6GKSuujmN14o1wXv0vinIWxdkbgyEXzzHodJNdsLQ4JU6G0dYbEPNxXCV6JO r4u55X5HAP7xIZnvR98T9tFrlY6eDIOv3Sr4NQTHJ1rsfCYaK8aPzB/ro/klnvf58ZUv1A Wy7cE2pB7IZx0KZV1V7MNk76IsMB9ucaJJ3V/8xalXy/ek1IEe4255uS2mPSXx7biIck4u mOtHVxQ/HlOhyRQKTjWMlecnM+1J0gVJFEP6M/Oe9Utp16UMAF8UVd0FRliVr3gJ0IhNaF xpFZAbyGGOfTcrGh9zaFMgOpAJ4e7vMjjFu3fR9x5zaLVJpOD0+feTDAW6LFUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771943164; a=rsa-sha256; cv=none; b=eXYMtnWX4+B1o/AMM4HkdJZEfpADoifQMn9J6NWrra8E6XBgYXO0UV8HTBCLTpnVduYxmc DGdz6x2n7H3aCKloL5msrUoLbLcSCjz81RnnhN/5nZe8r+gDHgPP555xzNWMCsYKQfLGV1 DohLvgkkywXcS4MFX/dY5NCvpkgFxcyb+bd1IG4vyp0VyotX8CYKqLBSCgpRINfSWB+i6a kIPxe7bSTDndQwpbfmkxZx+llC60yqQfEX0o4hqtDmnQ4vfEaVXcbMd+YsTIySSqsQqAv6 7NA7s6nReVhlBXB3gIIUk4ujcqb+PmzvxK6yTXwD6Isf6+Oe/VbKEqCk7oDulA== 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=1771943164; 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=+qPrg7naIr2VU+Zeg4F3ADs8OyeUybPYPvjp5OyAmjA=; b=QJKCp0pWc81is7Oqyl0K3sSO25LNIqZuMvY44lA8LcBz64xZLCQHrCjX7TXXVvKgZGRcdC k6ABQVZu2SSFrcFUFiTUvxZpJ+BqJALlf5wKKOZOuUUf1UFynZZh0Rn+TY+IwUJ/7LjDxw XW1CCFbQv0b5siWoZQceDP0h+2VSDNkMQirVdHfo+JHXLRE/I7+mPCgcTSu+4PmfZS4K17 MZVYd1wSO6oJF+8JOSjylZbknrYgNxDvtcvPid9Dfc6gaTutyrlX917Sx8K4WUAItOEdHi pzOb32FKjakdAnr0ptevP1t/GCdiBI5l7aRaiEjVdQ+Ww396VT3qMRownlCsNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL0Q46JtQz4XD for ; Tue, 24 Feb 2026 14:26:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cf24 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 14:26:04 +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: 6c4777c59325 - main - ngctl: Fix getline loop 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 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: 6c4777c59325c2cfefcce0c466b3bf475404a550 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 14:26:04 +0000 Message-Id: <699db4fc.1cf24.4f3430f0@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6c4777c59325c2cfefcce0c466b3bf475404a550 commit 6c4777c59325c2cfefcce0c466b3bf475404a550 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-24 14:23:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-24 14:25:57 +0000 ngctl: Fix getline loop I misremembered when I wrote this code: getline() returns -1 on EOF, not zero, so the loop condition and the error check are both incorrect (though in practice getline() will never return 0). MFC after: 3 days Fixes: 3cbdcabf714d ("ngctl: Modernize code somewhat") Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55487 --- usr.sbin/ngctl/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/ngctl/main.c b/usr.sbin/ngctl/main.c index b58de1e042b3..2b711fd4155a 100644 --- a/usr.sbin/ngctl/main.c +++ b/usr.sbin/ngctl/main.c @@ -243,7 +243,7 @@ ReadFile(FILE *fp) unsigned int lineno = 0; int rtn = CMDRTN_OK; - while ((len = getline(&line, &sz, fp)) > 0) { + while ((len = getline(&line, &sz, fp)) >= 0) { lineno++; if (*line == '#') continue; @@ -252,7 +252,7 @@ ReadFile(FILE *fp) break; } } - if (len < 0) + if (ferror(fp)) rtn = CMDRTN_ERROR; free(line); return (rtn);