From nobody Wed Sep 24 07:43:51 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 4cWpkb4GN8z68fk2; Wed, 24 Sep 2025 07:43:51 +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 4cWpkb37PNz3k2f; Wed, 24 Sep 2025 07:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758699831; 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=jtZPJtnzaFaJ1zwHBCoJ1IWcS7qxj/1MUikoHoSF1po=; b=MG0uTv/mT0J9kbQoP7SHU+1w6msmNVJap71O3Rdl9yahVqjBoFRaC7ntHhQRh04AEPYt8j +1zdH0PSdAclbPjQcQi0mQU9jR5remQwT7uirJZGBOb1QBDlH+N3ZaG3TmLyvfmkoRplwi 7iA6GIvCF9SzUZLdMcrmftWcic8oEdNJMdTz6H0wlzpLOIfXFN8coMvDyVNCsycfHaBkcF 4QpmIivtu7fMRP+pUO+eSulL9mBVMhumlkuGAisalrb9s5gcbvePae34m/pxajQ22EeHu6 az5CuEtT6ka3RgAtw9PxiocIIQXF3KtnNLZWtTkz0IHSQ4ZiGf4uou3h5a48Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758699831; 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=jtZPJtnzaFaJ1zwHBCoJ1IWcS7qxj/1MUikoHoSF1po=; b=K/HHkxrT0/D7Mi+oKLNPgiTp5fyFNDl1frdoaIOJ/puJDGMLXxYyjEsc0aotXPbeW5niwp 3WEaDZF6D3C7f3IH66DNyFE9IaJtbUxwhavQI29gl/7GigrKYeWTT5eh24GoUTfZi3nCaD xcop1gY9yEKapEbRci4GEZmeGaznEIDv9PBp6ARmGR4HkxSoAZy0YdUozTxVurMWzYVEgh 25bx5OEdGdzGz4GRdcSKeOpEDdF2BdLbKRVYlnwZcl4xtnn7te4sMeduteOsnUDpW5k9SZ Z7vYC79FNEYKx+fiOG8F3grnn0tVj/5v7nzQUk0EETq5edmwvG7vVZ7LX3SUqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758699831; a=rsa-sha256; cv=none; b=iFRdk/94DkzFVVX/2pTjj28zIue2Sfy5b4ItFTkn66H9PzAjZ84uUNwRv3uhyDZzrxXgsU D5Yzuc792U9g3SxSdJbezHFSusH2LQjMVqQIc+G07/QvWhhZRopWkQZTdmVBOud9+x4ZtV GIr4FXKq2TZunbaLghODUkRU3P6t9ggJ4/zU/9le7yXomwu8fNdw8wY6aP8FecBAwIPagn qmLsxXH+LnEkP2NUwgCCxyYkYe5C002lwqnPpmuB4ggSGiUHy5vuD0PVy/E+cmyEWix+no Gmq/lEB1GUstnOClr5ijsB46Jaom80CDFPkaU2MGfH7VHe+5JR5tDJNheI1rAw== 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 4cWpkb2hZ9z6tR; Wed, 24 Sep 2025 07:43:51 +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 58O7hpaB029283; Wed, 24 Sep 2025 07:43:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58O7hpl9029280; Wed, 24 Sep 2025 07:43:51 GMT (envelope-from git) Date: Wed, 24 Sep 2025 07:43:51 GMT Message-Id: <202509240743.58O7hpl9029280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 1bc5c9a23225 - stable/15 - rc.d/moused: Fix misplaced `basename` 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1bc5c9a2322569ae62c2f428353128c25da4af14 Auto-Submitted: auto-generated The branch stable/15 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=1bc5c9a2322569ae62c2f428353128c25da4af14 commit 1bc5c9a2322569ae62c2f428353128c25da4af14 Author: Vladimir Kondratyev AuthorDate: 2025-09-23 08:33:03 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-09-24 07:42:04 +0000 rc.d/moused: Fix misplaced `basename` This fixes "usage: basename string [suffix]" message. Reported by: cy MFC after: 1 day (cherry picked from commit f586fc0cf8ff54393a3db565437788a12bdc6e99) --- libexec/rc/rc.d/moused | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.d/moused b/libexec/rc/rc.d/moused index 35a26bd57275..e267ae5b3cd8 100755 --- a/libexec/rc/rc.d/moused +++ b/libexec/rc/rc.d/moused @@ -46,8 +46,8 @@ moused_start() # the moused_port variable, which if not defined sets it to the # passed in device name. # - ms=`basename $1` - if [ -n "$ms" ]; then + if [ -n "$1" ]; then + ms=`basename $1` eval myflags=\${moused_${ms}_flags-$moused_flags} eval myport=\${moused_${ms}_port-/dev/$1} eval mytype=\${moused_${ms}_type-$moused_type}