Re: [PATCH v2 1/4] man/man5/ld.so.conf.5: document include syntax

[Alejandro Colomar <alx@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 3028 bytes --]

Hi DJ,

> In-Reply-To: <ad382eef274a64bfa0724a31f09846948a84142b.1784084289.git.dj@redhat.com>

I suggest using the following git-config(1) configuration for
git-format-patch(1), so that patches are in reply to the cover letter,
instead of in reply to the preceding patch.

	[format]
		thread = true

Alternatively, --thread=shallow in the command line will have the same
effects.


On 2026-07-14T22:58:09-0400, DJ Delorie wrote:
> ---
>  man/man5/ld.so.conf.5 | 28 ++++++++++++++++++++++++++++
>  man/man8/ldconfig.8   |  2 --
>  2 files changed, 28 insertions(+), 2 deletions(-)
> 
> diff --git a/man/man5/ld.so.conf.5 b/man/man5/ld.so.conf.5
> index 481cf9152..25f9adf90 100644
> --- a/man/man5/ld.so.conf.5
> +++ b/man/man5/ld.so.conf.5
> @@ -9,6 +9,34 @@ .SH DESCRIPTION
>  This file contains a list of directories,
>  one per line,
>  in which to search for libraries.
> +.P
> +The file
> +(and any other files included by it)

Since the contents are specified as being processed as if being included
in the main configuration file, this is already implied.  I'd remove the
parenthetical.

> +is parsed by
> +.B \%ldconfig

	.B \%ldconfig (8)

> +and the results stored in
> +.IR /etc/ld.so.cache .
> +.P
> +The syntax allows lines to start with the word

s/word/keyword/

> +.I include
> +followed by a path wildcard,

	followed by a
	.BR glob (7)
	pattern,

> +and will include any files matching that wildcard.

I'd remove this line entirely.  It's redundant with the text below.

> +The wildcard is a path specification in the
> +.BR \%glob (7)
> +format.

Also remove this sentence.  By saying 'a glob(7) pattern' above, this is
already specified.

> +Files matching that wildcard will be processed

s/wildcard/pattern/

> +as if their contents were included in the main config file.

I have concerns about talking about the *main* file.  I'd say they are
processed as if their contents were included at the point of the include
directive.  (I suspect nested includes are allowed, right?)

> +.P
> +Example config file:
> +.IP
> +.in +4n
> +.EX
> +/lib
> +/usr/lib
> +/usr/local/lib
> +include /etc/ld.so.conf.d/*.conf
> +.EE
> +.in

This should be moved to EXAMPLES, right after FILES.

	.SH EXAMPLES
	Example config file:
	.P
	.in +4n
	.EX
	/lib
	/usr/lib
	/usr/local/lib
	include /etc/ld.so.conf.d/*.conf
	.EE
	.in


Have a lovely day!
Alex

>  .SH FILES
>  .I /etc/ld.so.conf
>  .SH SEE ALSO
> diff --git a/man/man8/ldconfig.8 b/man/man8/ldconfig.8
> index 9ac146b44..cb7d62ccc 100644
> --- a/man/man8/ldconfig.8
> +++ b/man/man8/ldconfig.8
> @@ -178,8 +178,6 @@ .SH OPTIONS
>  is also specified,
>  the cache is still rebuilt.
>  .SH FILES
> -.\" FIXME Since glibc-2.3.4, "include" directives are supported in ld.so.conf
> -.\"
>  .\" FIXME Since glibc-2.4, "hwcap" directives are supported in ld.so.conf
>  .PD 0
>  .TP
> -- 
> 2.47.3
> 
> 

-- 
<https://www.alejandro-colomar.es>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]