diff options
| author | sos <sos@FreeBSD.org> | 1998-05-26 20:12:56 +0000 |
|---|---|---|
| committer | sos <sos@FreeBSD.org> | 1998-05-26 20:12:56 +0000 |
| commit | bc60c8025eefe519b725f9a4d278ec3e887f7e00 (patch) | |
| tree | 37210576f0aee50d6bf52bcf2871ece5963fc993 /sbin/ldconfig/ldconfig.c | |
| parent | 37218a27856974855d62695874c9a46e494374dc (diff) | |
| download | FreeBSD-src-bc60c8025eefe519b725f9a4d278ec3e887f7e00.zip FreeBSD-src-bc60c8025eefe519b725f9a4d278ec3e887f7e00.tar.gz | |
ELF preparation step 2:
Move a.out libraries to /usr/lib/aout to make space for ELF libs.
Make rtld usr /usr/lib/aout as default library path.
Make ldconfig reject /usr/lib as an a.out library path.
Fix various Makefiles for LIBDIR!=/usr/lib breakage.
This will after a make world & reboot give a system that no
longer uses /usr/lib/*, infact one could remove all the old
libraries there, they are not used anymore.
We are getting close to an ELF make world, but I'll let this
all settle for a week or two...
Diffstat (limited to 'sbin/ldconfig/ldconfig.c')
| -rw-r--r-- | sbin/ldconfig/ldconfig.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c index 1f54178..096ce52 100644 --- a/sbin/ldconfig/ldconfig.c +++ b/sbin/ldconfig/ldconfig.c @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ldconfig.c,v 1.19 1997/07/11 14:45:41 jkh Exp $ + * $Id: ldconfig.c,v 1.20 1997/08/22 04:42:12 peter Exp $ */ #include <sys/param.h> @@ -146,7 +146,12 @@ char *argv[]; if (stat(argv[i], &stbuf) == -1) { warn("%s", argv[i]); rval = -1; - } else { + } + else if (!strcmp(argv[i], "/usr/lib")) { + warnx("WARNING! '%s' can not be used", argv[i]); + rval = -1; + } + else { /* * See if this is a directory-containing * file instead of a directory |
