From nobody Tue Jun 27 15:04:23 2023 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 4Qr7KN2bGwz4k4gV; Tue, 27 Jun 2023 15:04:24 +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 4Qr7KN1fRzz3N1k; Tue, 27 Jun 2023 15:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687878264; 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=yaNGQwYYgiea3v3wVN/DfPXe7beAJJjI4000ieU3HnQ=; b=DqK+dGkXOBVCk6lBFAdECWJvR5lXzEToIQTfRaRwcEU0Zvse/Jk7oz+izkzCkcwIw881b+ aAI5D34z0W0KdSeQW0UX8OfSeZ5X2hJhlqQp5u7W0CLhskPmieO0+q+TeJd3CKX7mvL4bb GWm6+EPE1wmgv+J7cdb4+m0Ip3xMkSWT1paS1aza1UUvMLZg+jLpYxRCYjvGtylHI5mRNk CBO4VI4rAev6mOk8SLTebm4EFUO0NN7yNmQIgKdcV4OZnKB8xPniSvPKMvC1HZBmF0QLXX R4TgKG9uW0qQyPYjieGjDQ2uHMzb6bqbiV36N9Ce4ZJ1hYgu7Ih+/7HRqylT8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687878264; 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=yaNGQwYYgiea3v3wVN/DfPXe7beAJJjI4000ieU3HnQ=; b=Vcm9P9dr/7N1fl4QeT0YOhrsabyfK7vgTnIv/TnEzynKjFtz9iez6eNYUhe///bGpP513C /+sOZGXVz/SuBmrUr+8bfdZEplgyjDOa7G6QoIUAZ4/y6wRnxg/x1aSZXh+LzYvYhWGtaF OvGTNzfWoNgMcBaY0JQ6le/x5hSdftCuRoL8+PNpTBJSnOLC0xdLA2xoMZ5J2uKRpIr8gT lg+N1cUcWghDhfyGs7APUapqbo1ax65OQSUD/5wQeG6//7f9CTqnKSVermv1VJjyCoqcXV DdiflAoHB7+XsjpTXcVO9/gvQEPeViD72VC0PLhTXfHK+ZyzrSBgUpwXR8tcew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687878264; a=rsa-sha256; cv=none; b=hir5xaYrKC4Z+waYfCFR1jPPGruzfnbfiChFhQjR29hBTJXNd9fDd8djJN/KwP+m8mEmLA UI3EbdEsQDvPBB2zNxQBIgSG2hDHpSkc8jcF+g0KbNhxQZuEBwxD4y7+YVogmW+dIPre+j gHEWvJeeHD/Fio3vur5v98oQ6ewd6VP7DXExtUDMMYhuT4mdO3OLlqShXL/4IIy1j/n2gC OJfLKsyFoDaqUrbAXFwZ5jlhlecMh44aq+qqMzgRvZjtiITbTm7/kZHe6jLXndbZXi3nEu yHhkTADDK1g5aPjgo+PMN8NdoDzGOmomkGp9qJI/hnQmtgFYAq8Eix8LiJBcHg== 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 4Qr7KN0XKmzx1H; Tue, 27 Jun 2023 15:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35RF4N0c089311; Tue, 27 Jun 2023 15:04:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35RF4Nfl089310; Tue, 27 Jun 2023 15:04:23 GMT (envelope-from git) Date: Tue, 27 Jun 2023 15:04:23 GMT Message-Id: <202306271504.35RF4Nfl089310@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8edb6fb572f2 - main - man(1): Support custom sections 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8edb6fb572f29578877fdac3c30f718e589a0360 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8edb6fb572f29578877fdac3c30f718e589a0360 commit 8edb6fb572f29578877fdac3c30f718e589a0360 Author: Mohamed Akram AuthorDate: 2023-06-27 13:51:24 +0000 Commit: Warner Losh CommitDate: 2023-06-27 13:51:27 +0000 man(1): Support custom sections PR: 271830 Signed-off-by: Mohamed Akram Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/764 --- usr.bin/man/man.sh | 70 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 25 deletions(-) diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index aa7d1287405a..2b20c4394733 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -69,6 +69,25 @@ build_manlocales() { decho "Available manual locales: $MANLOCALES" } +# Usage: build_mansect +# Builds a correct MANSECT variable. +build_mansect() { + # If the user has set mansect, who are we to argue. + if [ -n "$MANSECT" ]; then + return + fi + + parse_configs + + # Trim leading colon + MANSECT=${mansect#:} + + if [ -z "$MANSECT" ]; then + MANSECT=$man_default_sections + fi + decho "Using manual sections: $MANSECT" +} + # Usage: build_manpath # Builds a correct MANPATH variable. build_manpath() { @@ -548,10 +567,10 @@ man_find_and_display() { fi } -# Usage: man_parse_args "$@" +# Usage: man_parse_opts "$@" # Parses commandline options for man. -man_parse_args() { - local IFS cmd_arg +man_parse_opts() { + local cmd_arg OPTIND=1 while getopts 'K:M:P:S:adfhkm:op:tw' cmd_arg; do @@ -601,19 +620,6 @@ man_parse_args() { do_apropos "$@" exit fi - - IFS=: - for sect in $man_default_sections; do - if [ "$sect" = "$1" ]; then - decho "Detected manual section as first arg: $1" - MANSECT="$1" - shift - break - fi - done - unset IFS - - pages="$*" } # Usage: man_setup @@ -633,14 +639,8 @@ man_setup() { decho "Using architecture: $MACHINE_ARCH:$MACHINE" setup_pager - - # Setup manual sections to search. - if [ -z "$MANSECT" ]; then - MANSECT=$man_default_sections - fi - decho "Using manual sections: $MANSECT" - build_manpath + build_mansect man_setup_locale man_setup_width } @@ -787,6 +787,10 @@ parse_file() { trim "${line#MANCONFIG}" config_local="$tstr" ;; + MANSECT*) decho " MANSECT" 3 + trim "${line#MANSECT}" + mansect="$mansect:$tstr" + ;; # Set variables in the form of FOO_BAR *_*[\ \ ]*) var="${line%%[\ \ ]*}" trim "${line#$var}" @@ -1008,12 +1012,28 @@ do_full_search() { } do_man() { - man_parse_args "$@" + local IFS + + man_parse_opts "$@" + man_setup + + shift $(( $OPTIND - 1 )) + IFS=: + for sect in $MANSECT; do + if [ "$sect" = "$1" ]; then + decho "Detected manual section as first arg: $1" + MANSECT="$1" + shift + break + fi + done + unset IFS + pages="$*" + if [ -z "$pages" -a -z "${Kflag}" ]; then echo 'What manual page do you want?' >&2 exit 1 fi - man_setup if [ ! -z "${Kflag}" ]; then # Short circuit because -K flag does a sufficiently