From nobody Fri Aug 1 14:15:06 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 4btnyz1Rhwz63wTZ; Fri, 01 Aug 2025 14:15:07 +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 4btnyz0PTQz3jxG; Fri, 01 Aug 2025 14:15:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754057707; 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=3kk/XZll8sd+ayQis0IQyVt8HhqebO2QGKEVcIv+Xa8=; b=dXsCsYTG+YLEX/3b9/1UkWe7qSeEIVWBET+zSwYuKHY1YziQkjtjnrkiNIMCqkH0EXHsm7 viVAXKL2NIaGk8ivagIIY5EABRFKWaWBucFGzcDIsgMM6x5ty2nzYzRhQwfHEnjDP5iGmN 4RTN8J10Sn8zIVUB2ykK5Ow8jFU5JaKUXlKhX9aNPasTlt5oiAxx64/qlA5NN8FLU5Orb0 NV/IaKVd61XgkNoeMdGiyiLVsRT+Uk1WSuQmJt19dxjN26Ypgxhqo7HKUoMKYGutg0+ory MSLubxLzDDnXoON07VNrYfXk9zmUjC9SglCF9lgyEWdGxa/nf2CegT0QtkRnGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754057707; 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=3kk/XZll8sd+ayQis0IQyVt8HhqebO2QGKEVcIv+Xa8=; b=Syr4kHwyEje/qeApuEOwg1eDh/yvWb6C4Rh8eotyf0044Jx0uA8jswXwQs4iogbp4Su/P0 EG/Cd5MA5CB63zLTCGybVOzYdWLqnJaczR7Axo3EiuX3/Z72NVrtfcdqSuwvpkYvjo2VuU HTT3sG539fImojr/57spRra84EVeAslbQjoriyrp0KVuwZM/IapG6XWwJCm/sLBkwgWsIA 8l0/moW4sgOHJXlkg+GOfXKqkSf7C4V0Jj5Tl+S91S1CX2CjN6iznelk+pwdprjyN4HF9W hfWDxrvrgCjSsa/TxabQkYH4mFUN6yB6eho2GZ9f2XSFUjJEXVWKOoEk6OGshA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754057707; a=rsa-sha256; cv=none; b=HkgWdGB9pyoR0UtcL2da6bvUZ7CpcwZ+51c/qa/GorSTMJhjRkpHVcmyJOBSlEYcIqIw95 VpoTfzy5ePwnhPpkP8cBtb7Oh1bxXhZzco2vwDKC6mRAO8uLnBsddyaOIK+Tz162L41dN1 muBA3CCyM8LN8JOtVtVGMARSoLhCd8VRrjYDC5BYGh54uMEpmID/g0oPxUR6w91j8bQ771 lsOS0gD6fsmEY3wf0Xz27d7d9UrnCaQrn+H272O0ZgGSukGYo/Ru5FLIoaBm+UFHozV+MD P3K5/K+OAoKJwlOJn69wF6rtgcpzDcvoOhq4gTS+D8lbY3L1IOsFonlVhnOpfg== 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 4btnyz00h2zqyX; Fri, 01 Aug 2025 14:15:07 +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 571EF6PF039161; Fri, 1 Aug 2025 14:15:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 571EF6cD039158; Fri, 1 Aug 2025 14:15:06 GMT (envelope-from git) Date: Fri, 1 Aug 2025 14:15:06 GMT Message-Id: <202508011415.571EF6cD039158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 7d4a177efc65 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 7d4a177efc653bc60a496ba0adf5cb4e0560fa07 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=7d4a177efc653bc60a496ba0adf5cb4e0560fa07 commit 7d4a177efc653bc60a496ba0adf5cb4e0560fa07 Author: Lexi Winter AuthorDate: 2025-07-31 15:54:53 +0000 Commit: Lexi Winter CommitDate: 2025-08-01 14:06:39 +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 --- 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 a0680d09e54c..1a4d062253dd 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1209,6 +1209,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 555e7dbaca64..468c9b4e80da 100644 --- a/sbin/ifconfig/ifconfig.h +++ b/sbin/ifconfig/ifconfig.h @@ -67,6 +67,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; @@ -75,11 +76,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; @@ -121,6 +124,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, \