From nobody Fri Feb 27 10:05:53 2026 X-Original-To: dev-commits-src-branches@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 4fMkVT3sJhz6Sbp9 for ; Fri, 27 Feb 2026 10:05:53 +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 4fMkVT3Fz1z4Chq for ; Fri, 27 Feb 2026 10:05:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772186753; 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=nSXKT1O6tJ5r10WmV4o5FEHn8NM9mzThjMupWg6T59I=; b=XHHHciybze3Xp1AT/tebkIb7TtQfkZcJrkcj8sRGEE8TQgTsmqHhA6cOKWBSyVEZz2LQif iPMFWp9Q5OojuXfNiRR2gQMcq68ZBjD3dJbtDVKH8LbfWlPt5b9fQES7cS9FcbINxjzzNL 0SDB2vhZVl298hLhcK5Qt4QoGxcQDjh41uyifvzU+fHOwnfGM/RsA5zIQy6bmH9GGbM1xU PM+8P55uFdoAx5/BBfEXGWGIHNTZ2Jwj2O+YQJSwFpKsVirOgkQ/EIDklllstxLS5+9w0v zwzRSQFmd3zkdCk4yRCJEstTCfzdcCchfc8sTlSgHIuiTSPSGsj1ln9Z9z2JdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772186753; a=rsa-sha256; cv=none; b=JENySUL8M801qQtL0hxHh8Ya3MQkLcMmiV3zpLXFrpA4IfQJQOCnil56NVSJRrlO9Ymiz+ Be9r7R3QI00mNZqOX7NUJ6KSrjgOV0sxdVYlx3XDW03DhD8vq66KirqSvYFAKaZR0Kdm51 cwtK5fgMsMn18asv/3nNvMmxIG1YoL86WM01Xj4I/BCo+CgjAGS795zV/Umflq2K3bdTCX sfOcQ9pYa/zHRoGhGSZAMtVxuAbKawhB3nGJMoLgrQix3fYg1FBLOjJIjDdTyYfCbX7Imt B4TZxg15fJWRAsOWcehbc0fLM6Uy+BPDhI4xLI87onEPRZAP3ZHjAM0rcIVXbw== 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=1772186753; 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=nSXKT1O6tJ5r10WmV4o5FEHn8NM9mzThjMupWg6T59I=; b=m6UcN8qNg31Sgk0jwkIHsnkz8VETtSlphmUmUSYbd3M/N4U+xYAVkZhfI/Hg93WRRbMNxS eQLc2aWV3O8MpvHXkW9NWFFL/DJZ8u55/PUt9wpzmLLI1NIFF7vXh7jHGrI3QKGTxUfeni bfcJdo503xzCsVmP+DlEvsqh3sdyfKsXfX14sCUR1m650OF4aFc/j71u3vn/faBOz/eheO KBL8ZyNTUeXqXfgAEyZwKFSwv1ionecudPAg1aNbQkAILLUNCHVQs/NfcF0D4/ty6FW0UE BHo99H3vlPWKbON+VXYspyZAwLZLGNkRXlApCznBp7xvsPh6TNETx2CCjlWQPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMkVT2Vy7z1Bcq for ; Fri, 27 Feb 2026 10:05:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30858 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 10:05:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: d851e0070499 - stable/15 - ngctl: Fix getline loop List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: d851e0070499b8b34f3cf1efb956aefa6faf6859 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 10:05:53 +0000 Message-Id: <69a16c81.30858.65dde7ed@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d851e0070499b8b34f3cf1efb956aefa6faf6859 commit d851e0070499b8b34f3cf1efb956aefa6faf6859 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-24 14:23:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-27 10:05:26 +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 (cherry picked from commit 6c4777c59325c2cfefcce0c466b3bf475404a550) --- 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);