summaryrefslogtreecommitdiff
path: root/libexec/ld.so
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2005-12-31 15:08:23 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2005-12-31 15:08:23 +0000
commit6ff011df528f569831f48f4c23dc820a9552b33c (patch)
treebf477bc25ab99018cd28b9ff192223164f87915c /libexec/ld.so
parent97d07f2f60ee19928b25722bfc914dc7e3183ff8 (diff)
sort options and sync usage()
Diffstat (limited to 'libexec/ld.so')
-rw-r--r--libexec/ld.so/ldconfig/ldconfig.812
-rw-r--r--libexec/ld.so/ldconfig/ldconfig.c4
2 files changed, 8 insertions, 8 deletions
diff --git a/libexec/ld.so/ldconfig/ldconfig.8 b/libexec/ld.so/ldconfig/ldconfig.8
index 4ba3f15199c..49042da5987 100644
--- a/libexec/ld.so/ldconfig/ldconfig.8
+++ b/libexec/ld.so/ldconfig/ldconfig.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ldconfig.8,v 1.16 2004/11/22 00:58:39 jmc Exp $
+.\" $OpenBSD: ldconfig.8,v 1.17 2005/12/31 15:08:22 jmc Exp $
.\"
.\" Copyright (c) 1993,1995 Paul Kranenburg
.\" All rights reserved.
@@ -37,7 +37,7 @@
.Nd configure the shared library cache
.Sh SYNOPSIS
.Nm ldconfig
-.Op Fl RUmrsv
+.Op Fl mRrsUv
.Op Ar directory Ar ...
.Sh DESCRIPTION
.Nm
@@ -97,15 +97,15 @@ the existing hints file.
The default action is to build the hints file afresh.
This option cannot be used with
.Fl U .
+.It Fl R
+Rescan the previously configured directories.
+This opens the hints file and fetches the directory list from the header.
+Any additional pathnames on the command line are also processed.
.It Fl r
List the current contents of
.Pa ld.so.hints
on the standard output.
The hints file will not be modified.
-.It Fl R
-Rescan the previously configured directories.
-This opens the hints file and fetches the directory list from the header.
-Any additional pathnames on the command line are also processed.
.It Fl s
Do not scan the built-in system directory
.Pq Dq /usr/lib
diff --git a/libexec/ld.so/ldconfig/ldconfig.c b/libexec/ld.so/ldconfig/ldconfig.c
index 5072604efac..34eef3fdfda 100644
--- a/libexec/ld.so/ldconfig/ldconfig.c
+++ b/libexec/ld.so/ldconfig/ldconfig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ldconfig.c,v 1.16 2004/08/14 03:08:24 drahn Exp $ */
+/* $OpenBSD: ldconfig.c,v 1.17 2005/12/31 15:08:22 jmc Exp $ */
/*
* Copyright (c) 1993,1995 Paul Kranenburg
@@ -113,7 +113,7 @@ main(int argc, char *argv[])
break;
default:
fprintf(stderr,
- "usage: %s [-RUmrsv] [dir ...]\n", __progname);
+ "usage: %s [-mRrsUv] [dir ...]\n", __progname);
exit(1);
break;
}