From nobody Thu Apr 23 03:50:01 2026 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 4g1MYP6cDFz6bTwQ for ; Thu, 23 Apr 2026 03:50:01 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g1MYP1SWKz44ck for ; Thu, 23 Apr 2026 03:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776916201; 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=iy5WOP/C9jRtAN2oaxZpjgv1zNWi/ZN61P63cAqMOq4=; b=BzqDBPxTjrApATTQTQL03OSazv9wlobXoaWwDKdCX2v2WkCGFn8toASg+0VQzstqGH0ZCB d9lW3AjJ2v4KS4wd7sRRAKkHhZUAYrjfo8QYNbofF9bhRbuzmKuXNhp0A0dy1T5zwqwtkd gXGB/842on0bgJOgC0x2hhHrrf0dIQTEbNZ196q8waRzkci4Lr0FTQ7ImR7KdTSaKwnJSo hR0e8MxFUBxSG5ZOzt6+/2Q+PxO2QqEmnBlI+BN1n9N2bMrCOrVrNxK66Y9Q1LO3CyqfWA aIw5XlAFklJTcKp88islqfG/l6tdu4xPVsB1Gwy/PepFOb5AluvaBoqWusTlbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776916201; a=rsa-sha256; cv=none; b=bUYA9NEh8Cs5NPINluY3OweV6gGwJhnwQ8M3Ap49QnN+mmrYxrcq65pFBSVNMaZbjFSnPi zSlKVssDXwuKUL6vhDyWv9IxtzfygDaDWlwK02dS2jeriOTrzTXXN4CWO7xW53mHXD7kqM o9dZKEwqPRwmXXsXiSyUI5KXNKVGzcFXXl7FDs6zg8v4e9GzHgxoEOOnwoVzbkMojDI/TN Ddw1Si/oVJ+vRqKMOly3VzC8oeIe8CVQhDRdwzkJ1SwjdgXeQS5M9Xr8dJ0fXTR3d7E41G JAva3GzA3iiAF7mJEVfPLt4vMgp6i4trJMn+Th51SMv1KfQ8HgFtxUIMZx0erA== 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=1776916201; 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=iy5WOP/C9jRtAN2oaxZpjgv1zNWi/ZN61P63cAqMOq4=; b=UXBqpKSU2k0YJ3Wc6T4VfX9fHRTJd+s3a8DNC5tHZqM4WG4jcaO30kQqVju8a8Ox1LPthS zBN2ic9KqbTyv8tQ6uicBBjK8jo6lh51mmODYPiTm0CfnhGNXFd8z0OxxQxGyKMvT3/F+j a7GAOyyFEC/KvqGhW208Ukyr9v0ESDe8FyXzAjslMB6f22b4L79t0jvRIfPbAs2uRM7H9g x3pv4UN4Jg13pkyQMqQqhdXqvX+ETPcj4yHUOBCkfXtaZPRBUHmWPHyBR0pMcnHpLv1Yur xVVSyd+UVkrSUiD1v/TxQEFcS6I0q0Tzh9QQhRB8Oj/i5mgKW+828lZhFzTb5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1MYP0tLSz10kj for ; Thu, 23 Apr 2026 03:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b53c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 23 Apr 2026 03:50:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 0985637687de - stable/14 - jls: minor simplification to arg handling 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0985637687dea7edcb58f76c065271a5036927a9 Auto-Submitted: auto-generated Date: Thu, 23 Apr 2026 03:50:01 +0000 Message-Id: <69e996e9.3b53c.711c73f5@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=0985637687dea7edcb58f76c065271a5036927a9 commit 0985637687dea7edcb58f76c065271a5036927a9 Author: Kyle Evans AuthorDate: 2025-07-26 03:13:41 +0000 Commit: Kyle Evans CommitDate: 2026-04-23 03:27:35 +0000 jls: minor simplification to arg handling It's easier to reason about the state of argc/argv if we just augment them by optind after our getopt() loop. No functional change, but this sets the stage for another change to add a `-c` mode to (c)heck for the existence of a jail quietly without the caller having to worry about spurious output. Reviewed by: jamie (cherry picked from commit dbaaadd4373a725950ad11e578dab61537b7c4f2) --- usr.sbin/jls/jls.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/usr.sbin/jls/jls.c b/usr.sbin/jls/jls.c index f30b846a435d..6f8b214e8b9a 100644 --- a/usr.sbin/jls/jls.c +++ b/usr.sbin/jls/jls.c @@ -141,8 +141,11 @@ main(int argc, char **argv) ip4_ok = feature_present("inet"); #endif + argc -= optind; + argv += optind; + /* Add the parameters to print. */ - if (optind == argc) { + if (argc == 0) { if (pflags & (PRINT_HEADER | PRINT_NAMEVAL)) add_param("all", NULL, (size_t)0, NULL, JP_USER); else if (pflags & PRINT_VERBOSE) { @@ -180,9 +183,8 @@ main(int argc, char **argv) } } else { pflags &= ~PRINT_VERBOSE; - while (optind < argc) - add_param(argv[optind++], NULL, (size_t)0, NULL, - JP_USER); + for (i = 0; i < argc; i++) + add_param(argv[i], NULL, (size_t)0, NULL, JP_USER); } if (pflags & PRINT_SKIP) {