diff options
| author | Søren Schmidt <sos@FreeBSD.org> | 1998-05-26 20:12:56 +0000 |
|---|---|---|
| committer | Søren Schmidt <sos@FreeBSD.org> | 1998-05-26 20:12:56 +0000 |
| commit | cabb97dcbf9a5a7e0ce3b2cfef019afdfc9a21dc (patch) | |
| tree | 1284eccec11a5b3548b9afec0bbb7e2c2d522cc7 /gnu/usr.bin/ld | |
| parent | bcd26b5b67a597e36c3c8551e860b96ceef37aee (diff) | |
Notes
Diffstat (limited to 'gnu/usr.bin/ld')
| -rw-r--r-- | gnu/usr.bin/ld/ldconfig/ldconfig.c | 9 | ||||
| -rw-r--r-- | gnu/usr.bin/ld/rtld/rtld.c | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/ld/shlib.c | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/gnu/usr.bin/ld/ldconfig/ldconfig.c b/gnu/usr.bin/ld/ldconfig/ldconfig.c index 1f54178ce7a0..096ce52b8b57 100644 --- a/gnu/usr.bin/ld/ldconfig/ldconfig.c +++ b/gnu/usr.bin/ld/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 diff --git a/gnu/usr.bin/ld/rtld/rtld.c b/gnu/usr.bin/ld/rtld/rtld.c index 342ed74be07c..2897302729d9 100644 --- a/gnu/usr.bin/ld/rtld/rtld.c +++ b/gnu/usr.bin/ld/rtld/rtld.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: rtld.c,v 1.51 1997/12/05 02:06:37 jdp Exp $ + * $Id: rtld.c,v 1.52 1998/02/06 16:46:46 jdp Exp $ */ #include <sys/param.h> @@ -1965,7 +1965,7 @@ __dlsym(fd, sym) { if (fd == RTLD_NEXT) { generror("RTLD_NEXT not supported by this version of" - " /usr/lib/crt0.o"); + " crt0.o"); return NULL; } return __dlsym3(fd, sym, NULL); diff --git a/gnu/usr.bin/ld/shlib.c b/gnu/usr.bin/ld/shlib.c index efb0bb665bf8..be92dffa5434 100644 --- a/gnu/usr.bin/ld/shlib.c +++ b/gnu/usr.bin/ld/shlib.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$ + * $Id: shlib.c,v 1.18 1997/02/22 15:46:24 peter Exp $ */ #include <sys/param.h> @@ -52,7 +52,7 @@ * Standard directories to search for files specified by -l. */ #ifndef STANDARD_SEARCH_DIRS -#define STANDARD_SEARCH_DIRS "/usr/lib" +#define STANDARD_SEARCH_DIRS "/usr/lib/aout" #endif /* |