From nobody Sun May 26 05:51:56 2024 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 4Vn7Fm3WTYz4flRy; Sun, 26 May 2024 05:51:56 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vn7Fm2sZWz4nk2; Sun, 26 May 2024 05:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716702716; 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=ja/VOWPNmzcO9+NOevzVXM3H48cbrc4YysxjBDk5zpk=; b=rftFMf38AhlFfC41PeatWxd93dq+R/QcFABiHXfMPQ46LABabBiZlWjqm2rOBPn+0pUaVA njkCz186yFQ4/tMt+2yL6dlOWuaKoJO60Ds6EcuaTMoV2q7A5Gu8f98wmTJFjzGulU6JWc I2KB+uvxYhZr0GV+bA8KM9gRSj/P1GTENyENR88NQiuVYOPUjf/cdeukS9MQMH2OJvdrd0 0jLVPFFu8LZJGqqvE+cVn7DEN71zeHs3Rn1h1cpRyydHhhEwTT6BsD0sRw4gev8RkMyffc XlsYgNcIwQa3yMqGsOLFPoAijUQflEeePNdhOTDujlCyQpIYO3r2ABB7WjNHLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716702716; a=rsa-sha256; cv=none; b=fhnw9+ukQHyWlMpF4fbPMqB/nTOLYYv5qJkUfu7C/9+oFVZnRMSFA4srARDTbK4VvczFWL obD+Z6/ktmD6j87LVj+YEXs/7pp0I2zJ6d4Hggl1Am/ejrtz+w8IrFPydgcrLxGnckLhAm m5vzsalYD9Vz0z9ZRpSMFdgEYWifj33bf1ovJ4RWXMSGNRO63HPuB0LMRIdh8lWnXRvBHS nlZQxw3ZZWt+YKiW4HRnQ8Ybh6Pg87Qji8tqLkDAx1ZHBPvOIhy7gPpgjqHoTHT6h6BcLc 87PqCFPz79EDnfZX2uDk6J+BQZ/joYPNDK/i3KoxV2zzxvGki72pXB4AXeGlkQ== 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=1716702716; 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=ja/VOWPNmzcO9+NOevzVXM3H48cbrc4YysxjBDk5zpk=; b=mYsD8VOdywTF7Yi4EhfITU9RKmQUhdDCJFiplZij59c2pCu3Qp3on0creOr5k5gyGCEhfu 9i2q8fvaqnLH6G2xNKB0kM8BaZxdqdtQRxD6/UMFUqvV0v9JGAF0H+l47Maoc697eNjEKY FwkLEEcOJtRT8d4yxPGnIxkHSefiUg6828Sd7A0RIJVmL8ENCSFasYKY5+5x9rz8qE5NMl 3CXGkBn2x1jXk3cFj2eRafA2pYt4y/GRoYTkx//ApVS8wx9MryLI4P/j6/1KXtd0+h3S5F /X5L+ApdEuGra6Vol2aSkIlamxrtG9XxQKLmasr8oMwotitehQyUpS2unh/B7w== 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 4Vn7Fm2T5Hznf8; Sun, 26 May 2024 05:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44Q5puGh092326; Sun, 26 May 2024 05:51:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44Q5pu57092323; Sun, 26 May 2024 05:51:56 GMT (envelope-from git) Date: Sun, 26 May 2024 05:51:56 GMT Message-Id: <202405260551.44Q5pu57092323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: 73eb53813fe3 - main - man(1) needs to check for .so files not only in the first line PR: 279182 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: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73eb53813fe3a2245edbeb670902e4bb9d41e288 Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=73eb53813fe3a2245edbeb670902e4bb9d41e288 commit 73eb53813fe3a2245edbeb670902e4bb9d41e288 Author: Wolfram Schneider AuthorDate: 2024-05-26 05:48:40 +0000 Commit: Wolfram Schneider CommitDate: 2024-05-26 05:48:40 +0000 man(1) needs to check for .so files not only in the first line PR: 279182 Some manual pages have a copyright notice or commit id before including other files with the .so macro. We need to skip comments and empty lines at the beginning of the manpage while checking for the first .so macro. MFC after: 1 week --- usr.bin/man/man.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index af638527f497..24a0464689cc 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -322,7 +322,7 @@ man_check_for_so() { # We need to loop to accommodate multiple .so directives. while true do - line=$($cattool "$manpage" 2>/dev/null | head -n1) + line=$($cattool "$manpage" 2>/dev/null | grep -E -m1 -v '^\.\\"[ ]*|^[ ]*$') case "$line" in .so*) trim "${line#.so}" decho "$manpage includes $tstr"