From nobody Tue Mar 10 10:55:28 2026 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 4fVW4d0LfCz6VRDb for ; Tue, 10 Mar 2026 10:55:29 +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 4fVW4c6nG5z448M for ; Tue, 10 Mar 2026 10:55:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773140129; 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=QjTy4+SE21t7hi6B5AGr9a0dVMLnv/z81Um3qtrdxo4=; b=M4CFkFj0uNbg5vtTeW+Cf9a+suK8s0C/9g2/wuo1inBHjo9hkvXWhDd4a8aQ0ocQHfGPbo CQCjMUcz+OxasM3QL12q9bZXfAnJpKw9oaPpnKMr5F+pOpKkmV+f0NxoFE5QucNXRtcv2r l9yhwYyx8hFCt4uMf/Tx2XovpCJePvN6/VK/hYW+csqpXELP815q/+DRADdgKoBHPbIfoO CSuc/FkPp+SSuUMvA6gV+86phuqcJD/QhipZdMvny+KKaBsSZ4WVh4Fk9Vzh0sAsPLiuc/ 75VPioYqj5kuXvHMglPQU3t7OLMgYp7j4upCzo+C5bsvUM/mT+Nlx2B9dSC2lA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773140129; a=rsa-sha256; cv=none; b=cBI15RGHFY2gd4/Y7+7ObO7x40Wfg7yxbV+EPHmZ6xGHEgll2JfiKKGSMyz7GRqKPI/7p+ fRxB5O27vwFCI50Wkxik4UuxycQKlGv4gjx9cDba1LkGY5kYuLrf31S/Le2ucY/LWizuKH nJ93XvTYoXIiw9LhCVv1YorcDt21GzsqAq/k3/jBPe3scpos2Vk7bRRYPssyj8S2iTdLOD uxDxA3DSDsG0Y5pZGDHUkFtNfi4fZbf9evLWgjgYcBxR2JueOe6Ks7DxQhJpD/PYm4YQBv PRNb+PUogdf8TkujgSFicLBfNUsrrpOPK9VY+8NxR97xwSWc4v2Zt+o+0NtwyA== 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=1773140129; 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=QjTy4+SE21t7hi6B5AGr9a0dVMLnv/z81Um3qtrdxo4=; b=atzvyWlxseseeKGdybPkQ7ZDRnwd9flpiYwS5oSUK879jnkf4G6jpKTIakhEbhNB+RIs55 rNOHO9mplOWUn1svMx9UE6S34aPDR5EyZ6X0dcfTpnmJzY39QTYjGW3OmLa+E6a1EK8NCZ buX2V915iUh704pt/gLSvmuH9kIyU0vkpkiBnGNYXv3aXTiMDpDngQGyjYpzsoJOFya34c vxUNue1CV0WOxx4kW7vnBCzB/kBsn3fcDxAnLwbgbMwl1QuZcDJQYnDhDEsrmcFt1odV8s 2sNbrJjbBdkWh4TZxMUdzNtt/rSWPV2E5alXuNH7K2hyIx+4TstfODVEr4NiWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVW4c68njz18F5 for ; Tue, 10 Mar 2026 10:55:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46547 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 10:55:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: a2b601343bf9 - main - virtual_oss: Combine -d, -l and -L option getopt code 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2b601343bf9261c4ada51e4d4c30c5b9320bb2b Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 10:55:28 +0000 Message-Id: <69aff8a0.46547.1503cad9@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a2b601343bf9261c4ada51e4d4c30c5b9320bb2b commit a2b601343bf9261c4ada51e4d4c30c5b9320bb2b Author: Christos Margiolis AuthorDate: 2026-03-10 10:55:21 +0000 Commit: Christos Margiolis CommitDate: 2026-03-10 10:55:21 +0000 virtual_oss: Combine -d, -l and -L option getopt code Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55671 --- usr.sbin/virtual_oss/virtual_oss/main.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/main.c b/usr.sbin/virtual_oss/virtual_oss/main.c index 6c5ba8112c8b..6a56adbc6075 100644 --- a/usr.sbin/virtual_oss/virtual_oss/main.c +++ b/usr.sbin/virtual_oss/virtual_oss/main.c @@ -2228,24 +2228,6 @@ parse_options(int narg, char **pparg, int is_main) strncpy(profile.wav_name, optarg, sizeof(profile.wav_name)); break; case 'd': - if (strlen(optarg) > VMAX_STRING - 1) - return ("Device name too long"); - strncpy(profile.oss_name, optarg, sizeof(profile.oss_name)); - - if (profile.bits == 0 || voss_dsp_sample_rate == 0 || - profile.channels == 0 || voss_dsp_samples == 0) - return ("Missing -b, -r, -c or -s parameters"); - - val = (voss_dsp_samples * - profile.bits * profile.channels) / 8; - if (val <= 0 || val >= (1024 * 1024)) - return ("-s option value is too big"); - - ptr = dup_profile(&profile, opt_amp, opt_pol, - opt_mute[0], opt_mute[1], 0, 1); - if (ptr != NULL) - return (ptr); - break; case 'L': case 'l': if (strlen(optarg) > VMAX_STRING - 1) @@ -2254,7 +2236,7 @@ parse_options(int narg, char **pparg, int is_main) if (profile.bits == 0 || voss_dsp_sample_rate == 0 || profile.channels == 0 || voss_dsp_samples == 0) - return ("Missing -b, -r, -r or -s parameters"); + return ("Missing -b, -r, -c or -s parameters"); val = (voss_dsp_samples * profile.bits * profile.channels) / 8; @@ -2262,7 +2244,7 @@ parse_options(int narg, char **pparg, int is_main) return ("-s option value is too big"); ptr = dup_profile(&profile, opt_amp, opt_pol, - opt_mute[0], opt_mute[1], c == 'L', 0); + opt_mute[0], opt_mute[1], c == 'L', c == 'd'); if (ptr != NULL) return (ptr); break;