From nobody Fri Jun 27 20:18:57 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 4bTRhy5T7Qz60C97; Fri, 27 Jun 2025 20:18:58 +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 4bTRhy3F5Gz3KK2; Fri, 27 Jun 2025 20:18:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751055538; 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=VGkBsW0qW2fdJKn6eB+G+xdaj7plHNqn4BZfLrf4vHo=; b=wYJzeyaol297OJ+FXs7DjKfkLE+WdQ517prBKBI1nmAAAwAFO18vDi5hGB7721OQsD6cDh 38G35dMmakFaoB1fUniqIhOh4zmag/Ug69Ry5jqXcfu/Q5MDkhU6ulZUr26zaXn9KwSpNH HX4e+aMSM6rkbkgjye2HIilNapiv0uJfe7y1aaQNRTWxIaD8DDpq9RjjRgcoUs2I8mYEqL OxGl3Z6dLg1P+R0iL0oBHCVj8AXjE9SVhmsCw7uGF5kWzfuwFAwsVRJAVk4XL0b0Jqs5Sv DnL66MgTpZyJXUU61AMvBPUthvj2qoy8aN08IbpJ++86pZ4yT+XD0ODMDD0A4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751055538; 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=VGkBsW0qW2fdJKn6eB+G+xdaj7plHNqn4BZfLrf4vHo=; b=KtoUjuoauAWzFrtXbkqmh0Ir9LEL/u53Wp/lNF1x6XGKaWXoDpyw1wfPFWpzViLSoeRd9K rzOOlGefwb5XL1ZcC6LNzDLLADQDB7Y1whHO1QgCoeDCJbDTKfDVLpPDY0Y26IOG83WsBY 9xRRmtwX9iGtRV+bfOaNWA8MP7nWuwTan6/mJitysPJ6KGzPfLaHD3Z1zN2RELJ2FINxUN Ac/T8TQISeYvDE4wGP1M2Al8B5+72QGbLNBIQsnWOoWzNd3gTDW5LyzLYxpKTmowdmnG60 vDcQoRIjy8txM9E95G87cPGOmiUf8Y7WERpGKeArp6n9yVjk1EfqiQxe1U8YPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751055538; a=rsa-sha256; cv=none; b=OUNrh/X5jwPEZjgd1bOx7AXEoSXZ5snDylaxE3Yvi9I9NsVhYOXwkZaFvO7Ygu2Ethr2Id 08zkY+S6ghoA5F5Cyzb4hpQ3N5bkqCa+giU1MRszmIlBNfz36sqRzliY6oIbpg3lZ2cgD9 JUGXdJN/r/7350N1MHprtRbUp1Ck7UCarhoq08xihAVFf8Q/8EQhg7ha4crBv6OcjNPI8n GyCjalub38P6X+etCi3/F7g0OPMEo+eQmLkB+s+eniad5HqqCY5JB1NwTLehPxi/VCOOfM NwHUmu64OzGWiJ2oZr+dCYnYjT7DrcZ0tw7R3puJAeHW6NqyrxW+uQEYQwXgBA== 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 4bTRhy0t0cz12S5; Fri, 27 Jun 2025 20:18:58 +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 55RKIvvr013474; Fri, 27 Jun 2025 20:18:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55RKIvYa013472; Fri, 27 Jun 2025 20:18:57 GMT (envelope-from git) Date: Fri, 27 Jun 2025 20:18:57 GMT Message-Id: <202506272018.55RKIvYa013472@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d783591a7deb - main - Revert "rc: Fix scripts that need pathname expansion" 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d783591a7debc75045e8fbb7c57622c6fda2da01 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d783591a7debc75045e8fbb7c57622c6fda2da01 commit d783591a7debc75045e8fbb7c57622c6fda2da01 Author: Mark Johnston AuthorDate: 2025-06-27 18:59:41 +0000 Commit: Mark Johnston CommitDate: 2025-06-27 20:18:24 +0000 Revert "rc: Fix scripts that need pathname expansion" The commit which motivated this is being reverted. This reverts commit 7faddeb395b7976b44393db24f48ec47040eff07. --- libexec/rc/rc.d/moused | 2 +- libexec/rc/rc.d/syscons | 4 ++-- libexec/rc/rc.subr | 24 ++++-------------------- 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/libexec/rc/rc.d/moused b/libexec/rc/rc.d/moused index 9bb1a5cedc31..6f1b95af0f0a 100755 --- a/libexec/rc/rc.d/moused +++ b/libexec/rc/rc.d/moused @@ -69,7 +69,7 @@ moused_start() ;; esac - for ttyv in $(expandpath "/dev/ttyv*"); do + for ttyv in /dev/ttyv* ; do vidcontrol < ${ttyv} ${mousechar_arg} -m on done } diff --git a/libexec/rc/rc.d/syscons b/libexec/rc/rc.d/syscons index 7ad9b720e454..325628a83d8c 100755 --- a/libexec/rc/rc.d/syscons +++ b/libexec/rc/rc.d/syscons @@ -237,7 +237,7 @@ syscons_configure_keyboard() if [ -n "${allscreens_kbdflags}" ]; then sc_init echo -n ' allscreens_kbd' - for ttyv in $(expandpath "/dev/ttyv*"); do + for ttyv in /dev/ttyv*; do kbdcontrol ${allscreens_kbdflags} < ${ttyv} > ${ttyv} 2>&1 done fi @@ -381,7 +381,7 @@ syscons_start() if [ -n "${allscreens_flags}" ]; then sc_init echo -n ' allscreens' - for ttyv in $(expandpath "/dev/ttyv*"); do + for ttyv in /dev/ttyv*; do vidcontrol ${allscreens_flags} < ${ttyv} > ${ttyv} 2>&1 done fi diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index d760b75a15a3..359eebd1d342 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -223,11 +223,10 @@ rc_trace() list_vars() { # Localize 'set' option below. - local - _s + local - local IFS=$'\n' line varname - # Disable path expansion temporarily in unquoted 'for' parameters below. - _s=$(set +o) + # Disable path expansion in unquoted 'for' parameters below. set -o noglob for line in $(set); do @@ -242,7 +241,6 @@ list_vars() ;; esac done - eval $_s } # set_rcvar [var] [defval] [desc] @@ -294,19 +292,6 @@ set_rcvar_obsolete() eval ${_var}_obsolete_msg=\"$*\" } -# expandpath str -# Apply pathname expansion to str. -# -expandpath() -{ - local _s - - _s=$(set +o) - set +o noglob - echo $1 - eval $_s -} - # # force_depend script [rcvar] # Force a service to start. Intended for use by services @@ -1798,19 +1783,18 @@ _run_rc_setup() _run_rc_doit() { - local _m _s + local _m debug "run_rc_command: doit: $*" _m=$(umask) ${_umask:+umask ${_umask}} # Disable pathname expansion temporarily for run_rc_command. - _s=$(set +o) set -o noglob eval "$@" + set +o noglob _return=$? umask ${_m} - eval $_s # If command failed and force isn't set, request exit. if [ $_return -ne 0 ] && [ -z "$rc_force" ]; then