From nobody Sat Jul 26 03:14:05 2025 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 4bpqb1395hz62xqq; Sat, 26 Jul 2025 03:14: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bpqb12F0Lz3cNF; Sat, 26 Jul 2025 03:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753499645; 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=ibWzX7SSYVruR4u9UGSMsjW4/Lc7yr9ic3/F8n/GVuw=; b=sFSFIPRiu3RQo3hhitIBzoyZRCTuU7M7AdGgRdkcGyK0izYYAU72xtRofU13o1tWJV6rkY Uo+mJAkFdmreNsfCqaq1UA6YWHE87P45oDyj2hNxjiWLQ7DB4gWxoqpSZabt1vM546IWQQ fO947rhznPy6tii7j8q6dNFCy8dLyi9R+gqCz0xtAEG6TgpGnls5dtn7S3GlzdIGJ754/U gIm22QMJfim05NrCRj9UrD+wttFik2wJx5N3mbKlj2/m1SLZ9169ZguGfZlqrIjwMtBHyI bDavfPRLFuBNxDJPA7P4KrC7Iof1+ChZYMF6t5pc+i806OJu6LERLXTIeM4/2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753499645; 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=ibWzX7SSYVruR4u9UGSMsjW4/Lc7yr9ic3/F8n/GVuw=; b=Nk5Vr31U/cw9Qc28RleQZSBsxTXDNmsI+l71CGlNPIQTE1p0egB7lxi3imFdCLMFfBiFyq 9G61bJ2wJKUcLpcvgH6+SsuFcMgyWkT/3L1cMsfhqv7LLkFStTSNTvYdjOxAoC3z5PbynP OVzL0PlHjVEvapdV16q3m9xsjzmQFXehmR+uOu1XyWFBP7d3R5b76/CxNfkPE3Lfe9wbEt rk0YcMtXYjZL6fkcJuJ9+2YTxGRMNMYkp7+OXcdTEEtJSMgD3AqqXnE/uiTZfONZb1XNUr o1Et5x3uQw8L8+5egRnavQq4CLGjuCCrYoPnhk+yPJEOG87bXAm9GDgiG4lsGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753499645; a=rsa-sha256; cv=none; b=IjncXZYgFIgDJMoDDpRvea9FHsbIDCd1HtOl+lnMS+DjsX+dTjqb/XmBdzV2lOZzbbirNM 3rjWonLvAVx5z2yK27DbrlOjIEndNBnzw0unlUdKSg4CWqXmRa6y5M1oRYQZNPV+1ITx7L 3l0SNfFc+5RyRTm2kwKvq1QmzOOkjqTUZjBYWaGK0SRyHWtYawBIKy4viysbuJSYMvBhXQ ZNJxenVTzI1Jj1O/Y2OpmhaEu+pYDpaD04msiXnOP6fI4xT1wck+i1a4zaxI1MnDwF5pNo wwtTgGSJzxpBVfc843AyiIuP4jL+raEGsBpknTdR76PXjNcj7+uU73GprxeVcg== 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 4bpqb11gQQz1Bcr; Sat, 26 Jul 2025 03:14:05 +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 56Q3E5w2002872; Sat, 26 Jul 2025 03:14:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56Q3E5cY002869; Sat, 26 Jul 2025 03:14:05 GMT (envelope-from git) Date: Sat, 26 Jul 2025 03:14:05 GMT Message-Id: <202507260314.56Q3E5cY002869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: dbaaadd4373a - main - jls: minor simplification to arg handling 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dbaaadd4373a725950ad11e578dab61537b7c4f2 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=dbaaadd4373a725950ad11e578dab61537b7c4f2 commit dbaaadd4373a725950ad11e578dab61537b7c4f2 Author: Kyle Evans AuthorDate: 2025-07-26 03:13:41 +0000 Commit: Kyle Evans CommitDate: 2025-07-26 03:13:41 +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 Differential Revision: https://reviews.freebsd.org/D51540 --- 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 bd193a69c458..a1d1716713aa 100644 --- a/usr.sbin/jls/jls.c +++ b/usr.sbin/jls/jls.c @@ -140,8 +140,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) { @@ -179,9 +182,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) {