ldconfig(8): Make -s a no-op.

The functionality of -s was removed in a369de1639fc. Also comment it out
in the manpage, but leave the option for compatibility.

Found-by: gcc47

diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8
index f9bde31..f913ff4 100644 (file)
--- a/sbin/ldconfig/ldconfig.8
+++ b/sbin/ldconfig/ldconfig.8
@@ -28,7 +28,6 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/sbin/ldconfig/ldconfig.8,v 1.19.2.10 2003/05/13 19:25:19 trhodes Exp $
-.\" $DragonFly: src/sbin/ldconfig/ldconfig.8,v 1.4 2007/05/19 17:32:12 swildner Exp $
 .\"
 .Dd October 3, 1993
 .Dt LDCONFIG 8
@@ -39,7 +38,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl elf
-.Op Fl Rimrs
+.Op Fl Rimr
 .Op Fl f Ar hints_file
 .Op Ar directory | Ar
 .Sh DESCRIPTION
@@ -126,10 +125,10 @@ List the current contents of the hints file
 on the standard output.
 The hints file is not modified.  The list of
 directories stored in the hints file is included.
-.It Fl s
-Do not scan the built-in system directory
-.Pq Dq /usr/lib
-for shared libraries.
+.\".It Fl s
+.\"Do not scan the built-in system directory
+.\".Pq Dq /usr/lib
+.\"for shared libraries.
 .El
 .Sh SECURITY
 Special care must be taken when loading shared libraries into the address

diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c
index 80bc095..86d5337 100644 (file)
--- a/sbin/ldconfig/ldconfig.c
+++ b/sbin/ldconfig/ldconfig.c
@@ -28,7 +28,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sbin/ldconfig/ldconfig.c,v 1.31.2.3 2001/07/11 23:59:10 obrien Exp $
- * $DragonFly: src/sbin/ldconfig/ldconfig.c,v 1.6 2004/11/04 13:14:11 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -65,7 +64,6 @@ main(int argc, char **argv)
 {
        static const char *hints_file;
        int c, justread = 0, merge = 0, rescan = 0;
-       int __unused nostd = 0;
 
        if (argc > 1 && strcmp(argv[1], "-elf") == 0) {
                /* skip over legacy -elf arg */
@@ -94,7 +92,7 @@ main(int argc, char **argv)
                        justread = 1;
                        break;
                case 's':
-                       nostd = 1;
+                       /* does nothing */
                        break;
                default:
                        usage();