d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ldconfig(8): nostd/-s does nothing

Browse Source 
Remove the option from man page and summary.  Silently ignore it when
parsing command line for backward compatibility.

Reviewed by:	emaste
Tested by:	jbeich
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D33058
This commit is contained in:
Konstantin Belousov 2021-11-19 07:21:21 +02:00
parent 3f2c6f5598
commit b828161d12
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/ldconfig/ldconfig.8
View File

@ -43,7 +43,7 @@
.Sh SYNOPSIS
.Nm
.Op Fl 32
.Op Fl Rimrsv
.Op Fl Rimrv
.Op Fl f Ar hints_file
.Op Ar directory | Ar
.Sh DESCRIPTION
@ -128,10 +128,6 @@ on the standard output.
The hints file is not modified.
.Pp
Scan and print all libraries found on the directories list.
.It Fl s
Do not scan the built-in system directory
.Pq Dq /usr/lib
for shared libraries.
.It Fl v
Switch on verbose mode.
.El

8
sbin/ldconfig/ldconfig.c
View File

@ -60,9 +60,9 @@ main(int argc, char **argv)
{
const char *hints_file;
int c;
bool is_32, is_soft, justread, merge, nostd, rescan, verbose;
bool is_32, is_soft, justread, merge, rescan, verbose;
is_32 = is_soft = justread = merge = nostd = rescan = verbose = false;
is_32 = is_soft = justread = merge = rescan = verbose = false;
while (argc > 1) {
if (strcmp(argv[1], "-aout") == 0) {
@ -109,7 +109,7 @@ main(int argc, char **argv)
justread = true;
break;
case 's':
nostd = true;
/* was nostd */
break;
case 'v':
verbose = true;
@ -132,7 +132,7 @@ static void
usage(void)
{
fprintf(stderr,
"usage: ldconfig [-32] [-elf] [-Rimrsv] [-f hints_file] "
"usage: ldconfig [-32] [-elf] [-Rimrv] [-f hints_file] "
"[directory | file ...]\n");
exit(1);
}