From nobody Tue Oct 13 23:08:29 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 4j494G1PyZz6w1rs for ; Tue, 13 Oct 2026 23:08:30 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j494F6vX1z4k4r for ; Tue, 13 Oct 2026 23:08:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791932910; 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=3EbqrrhNtIfX7XomL5aeG+b+Q7BUQdNkTC/wQmkRSok=; b=shdGR7V3TF0RvVO45aC+BYEvvL58JYuG6s6LOo30J/cgEMErl6Wf4i2SWuXfMlxFRgBJZj 4k7D4kD9TbUYeSsZRzi+4gRK6305sYWS2f+UyZ1Qz+5xJDfkxiCGgb8bxjFlZ/NLX5YPso daEP600hmKps5T6iIYhZkSMA2YGdcAS1kp2ddyd+tHosa/Bu2QuAopUoJelFNZNPqKIC1/ dpdGvp0zQbj0Mvgt3qpXE2AWkH8hj5u9bX1jgE2hS8UFcfnZzoIa1XVcWljYLapq57tPFp pX0Y3yArNp4zcVXGHBtr45yLZ+oAM+I6Dfa88oh6OaPKzZr+1kVP+LSW32sTCA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791932910; b=qtBguNZxZPndEbL+HqYm/un5cE1KGDk11ZnoOLHd63KHUczWkijHMYsvBnWwE0G01ErbYN UBPzr24yjs/uDcbrrLPwcnE5VKR2/w7EgLZB0wHgm6c+7gLhA6Tj6oEddkUCu4eTh21hOA snNba8T0BQT5iqKhDs12GsgK6T3u0yYiXnscw0FCB8j7EqupArJinYQKr6IY+IHH7RoKCQ 0t8/grvHNgUbifnabdholKSrCKB3hxSsaCeLs6MpwOjVbSUnv5RJm7ij+Q1Zfzhs4l/EFv uQg1qWJsdc2/bjEH6kW8IcnJ6e7+piexfq3JdUoiRGpM1WI2PDe+nHV7d+Evpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791932910; 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=3EbqrrhNtIfX7XomL5aeG+b+Q7BUQdNkTC/wQmkRSok=; b=a1NnPQeePlh3F6u5KQi309w9BeHD7z7Pjw4In6ILtY6ciKDAF1GUJ/0hq5GGthQ9ctVXR5 N3NMX2wa9Ub5FEweS9vHhAXkW+YwEwE0cC+8b61DAYexB0J86ot9W4mKelloPXjQ+450LP wbV/4SfDhwTnNj6YgvaDj5B6VsKUgTkw6cuBrARNPdazMFGVsA7Z3hKuTk/IyxOl+tg4uw W6bHO3RRqD06ZWD60N2pEZa2LK2oAXZmmPlpY02y0Y1VOMu5oIYjwcyuuMBq4HIutDbf2g udeCvklb2LWm38swJfKGz1q776QUgsYy/EEmSCKPE+ziK/0E/i+0wPXNhrzpVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j494F5pPdzcsf for ; Tue, 13 Oct 2026 23:08:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30e2f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Oct 2026 23:08:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: 064edc2ceb77 - main - debug.sh avoid trouble from set -e List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 064edc2ceb77389d17655c8aa347084e10d64add Auto-Submitted: auto-generated Date: Tue, 13 Oct 2026 23:08:29 +0000 Message-Id: <6aceb9ed.30e2f.78e72011@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=064edc2ceb77389d17655c8aa347084e10d64add commit 064edc2ceb77389d17655c8aa347084e10d64add Author: Simon J. Gerraty AuthorDate: 2026-10-13 23:08:15 +0000 Commit: Simon J. Gerraty CommitDate: 2026-10-13 23:08:15 +0000 debug.sh avoid trouble from set -e The setting of _TTY ran afoul of set -e. Also the handling of Myname blew up if debug.sh included by a login sheel (eg in .profile). For non-posix shell, leave false alone if it is a builtin. --- libexec/rc/debug.sh | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/libexec/rc/debug.sh b/libexec/rc/debug.sh index ea46e9a99c0c..d4274797564a 100755 --- a/libexec/rc/debug.sh +++ b/libexec/rc/debug.sh @@ -81,7 +81,7 @@ # Simon J. Gerraty # RCSid: -# $Id: debug.sh,v 1.47 2025/08/07 21:59:54 sjg Exp $ +# $Id: debug.sh,v 1.54 2026/10/13 23:00:48 sjg Exp $ # # @(#) Copyright (c) 1994-2024 Simon J. Gerraty # @@ -93,7 +93,10 @@ _DEBUG_SH=: -Myname=${Myname:-`basename $0 .sh`} +case $0 in +-*) ;; +*) Myname=${Myname:-`basename $0 .sh`};; +esac DEBUGGING= DEBUG_DO=: @@ -134,9 +137,14 @@ if test -z "$isPOSIX_SHELL"; then isPOSIX_SHELL=: else isPOSIX_SHELL=false - false() { - return 1 - } + case `(type false) 2>&1` in + *builtin*) ;; + *) + false() { + return 1 + } + ;; + esac fi fi @@ -231,8 +239,10 @@ _debugOn() { # DEBUG_DO so functions can trace if they want # _debugOff() { - DEBUG_OFF=$1 + $DEBUG_DO set -x # so we see DEBUG_OFF=something in the trace + DEBUG_OFF=${1:-$DEBUG_ON} set +x + DEBUG_OFF=$1 case "$_HOOKS_SH,$3" in ,*|:,|:,*[${CASE_CLASS_NEG:-!}A-Za-z0-9_]*) ;; *) hooks_run ${3}_debugOff_hooks;; @@ -404,7 +414,7 @@ DebugOff() { return $_rc } -_TTY=${_TTY:-`test -t 0 && tty`}; export _TTY +_TTY=${_TTY:-`test -t 0 && tty || :`}; export _TTY # override this if you like _debugShell() {