aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorJohn Polstra <jdp@FreeBSD.org>2000-07-09 19:12:49 +0000
committerJohn Polstra <jdp@FreeBSD.org>2000-07-09 19:12:49 +0000
commit97333b9e848d7cbcb01b9842fec3db59317c0334 (patch)
treea2973afc2c6fa93026176a95a249a02256973003 /sbin
parentbeea813ee4a5e7d246ae3905184ba08ed853007e (diff)
downloadsrc-97333b9e848d7cbcb01b9842fec3db59317c0334.tar.gz
src-97333b9e848d7cbcb01b9842fec3db59317c0334.zip
Make "ldconfig" with no arguments behave the same as "ldconfig -R".
Submitted by: Maxime Henrion <mhenrion@cybercable.fr>
Notes
Notes: svn path=/head/; revision=62858
Diffstat (limited to 'sbin')
-rw-r--r--sbin/ldconfig/ldconfig.81
-rw-r--r--sbin/ldconfig/ldconfig.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8
index e81565770fde..8f4f801b32ee 100644
--- a/sbin/ldconfig/ldconfig.8
+++ b/sbin/ldconfig/ldconfig.8
@@ -97,6 +97,7 @@ Generate the hints for ELF format shared libraries.
Rescan the previously configured directories. This opens the previous hints
file and fetches the directory list from the header. Any additional pathnames
on the command line are also processed.
+This is the default action when no parameters are given.
.It Fl f Ar hints_file
Read and/or update the specified hints file, instead of the standard file.
This option is provided primarily for testing.
diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c
index 07e5abcfa584..76f8299cfa43 100644
--- a/sbin/ldconfig/ldconfig.c
+++ b/sbin/ldconfig/ldconfig.c
@@ -115,7 +115,9 @@ char *argv[];
errx(1, "unknown object format \"%s\"", objformat);
hints_file = is_aout ? _PATH_LD_HINTS : _PATH_ELF_HINTS;
- while ((c = getopt(argc, argv, "Rf:mrsv")) != -1) {
+ if (argc == 1)
+ rescan = 1;
+ else while((c = getopt(argc, argv, "Rf:mrsv")) != -1) {
switch (c) {
case 'R':
rescan = 1;