From nobody Sat Aug 23 00:11:26 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 4c7yCM1T2lz65RW5; Sat, 23 Aug 2025 00:11:27 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCL47Kfz3Zv1; Sat, 23 Aug 2025 00:11:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907886; 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=eQOE39yxFRY0BjxsSuC0xNu0m356YDMVRMh9+i+Zcfk=; b=uWgbhYz67+xMAeIbgBe3MP+tUeVSCiYXhPfrmtfabwyMJ4eBPxZg622MDSGI5tsc/JC52U tTAuGloySYahcITUmHC2NngMsSxg6cCE0e14rGZ3Wn7MYf/ygLBjQbayPAOTM/DH4U3L0O czuvjDp4eZJtSWGJbxkRPzTKFaa9vSNMFLXn8KkYQSJP7VG1EDRAkya6VK8M47tvCGub5f fXAoUR8mdP45f3FKlidsbCLDJsZ/bsrBo7vlhB8GwNYuElUwLl7PHhsiWB5gdI02G652+W +YM6nk2LOI43NuklggMGJuPtIT/kHGpLY99sOqSevCJ5DKGObbpt0/6D9JY56w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907886; 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=eQOE39yxFRY0BjxsSuC0xNu0m356YDMVRMh9+i+Zcfk=; b=FAk5xZNOvFfWLCVNuVBGpSq0OAepzklY1sLQr9A5PQEMNaA4KgT3jpvt6Oc9MOYz/vtwVj cTPiaVJxVli+WKUaM8E1pQoEBWDrzMShPNRWChHSL9H9b6F9fmZ5MVpmhvHgEu5KVBtK1v tgGqpvHO2c1MaMlbb12oPk5/zRtlamg7REZ4vzE3iUnPb1Sj2MBTc/W2jt4cUY62rGMOTD F1qompa4gXn2jYvmVG6sMUMhQHKeAgH9MLtL3iIVYU7TYVeze8J6RvUKfCKen4QYoRs5u6 OFgF3r8fMr2Cx0lUa1LWT8vatU2/SMAAr+Tthqh0Dec1ChAUd8xwo44xKhFdoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907886; a=rsa-sha256; cv=none; b=hXLPw59Wm//f8mPRwzYt8+2av7i8pShwZyi0XTUtoVOLpH370MOE9evPeU4ljb7tNyfJDi ZuOCIPC1cI8qsfQWxYwAIp1SOsFcbGUp1pQjYQIRHp1GSw/tnruSdHXdL2FrR0gVqpRIAq M9hbvFy21MuxN1IOz6CbpwlwJuXzHKM+IXJpuYUsvIKYv6FZTpX8hkCyGTzJdK2mSBg4eF a+u4vS0SJ+76XB6zOGyQI7OeTbBRP4u76HPE7IlTI+wgLgB9SEr8ZF9odULNqYVfz7Kmxs 1pcmWwC4Za1/Mbed08F8XPXp4FgtR/d8A4oXmezW9OkxhF0uVMxPg/a/hLU3eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7yCL3S2hz17Mx; Sat, 23 Aug 2025 00:11:26 +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 57N0BQGD099858; Sat, 23 Aug 2025 00:11:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BQ34099855; Sat, 23 Aug 2025 00:11:26 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:26 GMT Message-Id: <202508230011.57N0BQ34099855@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 99f2177b0905 - stable/14 - ifconfig: Support variable-argument commands 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 99f2177b0905b9567ee35fd060b0db931e87b542 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=99f2177b0905b9567ee35fd060b0db931e87b542 commit 99f2177b0905b9567ee35fd060b0db931e87b542 Author: Lexi Winter AuthorDate: 2025-07-31 15:54:53 +0000 Commit: Lexi Winter CommitDate: 2025-08-23 00:10:15 +0000 ifconfig: Support variable-argument commands Add a new type of command, DEF_CMD_VARG, which takes an (argc, argv) pair instead of a fixed number of arguments. This allows commands to do their own argument parsing and accept a variable number of arguments. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D51243 (cherry picked from commit 7d4a177efc653bc60a496ba0adf5cb4e0560fa07) --- sbin/ifconfig/ifconfig.c | 7 +++++++ sbin/ifconfig/ifconfig.h | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index c1e3e0af83c2..9d7a40b9049a 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1218,6 +1218,13 @@ top: argc -= 2, argv += 2; } else if (p->c_parameter == SPARAM && p->c_u.c_func3) { p->c_u.c_func3(ctx, *argv, p->c_sparameter); + } else if (p->c_parameter == ARGVECTOR && p->c_u.c_funcv) { + int argsdone; + + argsdone = p->c_u.c_funcv(ctx, argc - 1, + (const char *const *)argv + 1); + argc -= argsdone; + argv += argsdone; } else if (p->c_u.c_func) p->c_u.c_func(ctx, *argv, p->c_parameter); argc--, argv++; diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h index 0ae317aca409..be333d0ae02f 100644 --- a/sbin/ifconfig/ifconfig.h +++ b/sbin/ifconfig/ifconfig.h @@ -66,6 +66,7 @@ typedef struct ifconfig_context if_ctx; typedef void c_func(if_ctx *ctx, const char *cmd, int arg); typedef void c_func2(if_ctx *ctx, const char *arg1, const char *arg2); typedef void c_func3(if_ctx *ctx, const char *cmd, const char *arg); +typedef int c_funcv(if_ctx *ctx, int argc, const char *const *argv); struct cmd { const char *c_name; @@ -74,11 +75,13 @@ struct cmd { #define NEXTARG2 0xfffffe /* has 2 following args */ #define OPTARG 0xfffffd /* has optional following arg */ #define SPARAM 0xfffffc /* parameter is string c_sparameter */ +#define ARGVECTOR 0xfffffb /* takes argument vector */ const char *c_sparameter; union { c_func *c_func; c_func2 *c_func2; c_func3 *c_func3; + c_funcv *c_funcv; } c_u; int c_iscloneop; struct cmd *c_next; @@ -120,6 +123,13 @@ void callback_register(callback_func *, void *); .c_iscloneop = 0, \ .c_next = NULL, \ } +#define DEF_CMD_VARG(name, func) { \ + .c_name = (name), \ + .c_parameter = ARGVECTOR, \ + .c_u = { .c_funcv = (func) }, \ + .c_iscloneop = 0, \ + .c_next = NULL, \ +} #define DEF_CMD_SARG(name, sparam, func) { \ .c_name = (name), \ .c_parameter = SPARAM, \