Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Jun 2024 16:04:48 GMT
From:      Wolfram Schneider <wosch@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 965fff98260f - main - man(1): ignore absolute path for .so include
Message-ID:  <202406031604.453G4mGY027971@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by wosch:

URL: https://cgit.FreeBSD.org/src/commit/?id=965fff98260ff53707b4ba38ff44fc5683a7189f

commit 965fff98260ff53707b4ba38ff44fc5683a7189f
Author:     Wolfram Schneider <wosch@FreeBSD.org>
AuthorDate: 2024-06-03 16:00:42 +0000
Commit:     Wolfram Schneider <wosch@FreeBSD.org>
CommitDate: 2024-06-03 16:00:42 +0000

    man(1): ignore absolute path for .so include
    
    We want only a relative include, as ".so man1/foobar.1"
    
    MFC after:      1 week
---
 usr.bin/man/man.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh
index 24a0464689cc..7461153942f5 100755
--- a/usr.bin/man/man.sh
+++ b/usr.bin/man/man.sh
@@ -324,7 +324,8 @@ man_check_for_so() {
 	do
 		line=$($cattool "$manpage" 2>/dev/null | grep -E -m1 -v '^\.\\"[ ]*|^[ ]*$')
 		case "$line" in
-		.so*)	trim "${line#.so}"
+               '.so /'*) break ;; # ignore absolute path
+               '.so '*) trim "${line#.so}"
 			decho "$manpage includes $tstr"
 			# Glob and check for the file.
 			if ! check_man "$1/$tstr" ""; then



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406031604.453G4mGY027971>