diff options
| author | ache <ache@FreeBSD.org> | 1995-10-24 06:48:16 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1995-10-24 06:48:16 +0000 |
| commit | 8c0bb648fb5214026c819fe123462295c165bc67 (patch) | |
| tree | 279348a91a6200d6e1e9c0bb9042bf2485588d5b | |
| parent | f30cf8615c698739b628e4fa3f1d2add3726bb9d (diff) | |
| download | FreeBSD-src-8c0bb648fb5214026c819fe123462295c165bc67.zip FreeBSD-src-8c0bb648fb5214026c819fe123462295c165bc67.tar.gz | |
Remove LD_NOSTD_PATH implementation, it isn't works and
can cause some problems.
Suggested-by: davidg
| -rw-r--r-- | gnu/usr.bin/ld/ld.c | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/ld/rtld/rtld.c | 6 | ||||
| -rw-r--r-- | libexec/rtld-aout/rtld.c | 6 |
3 files changed, 6 insertions, 10 deletions
diff --git a/gnu/usr.bin/ld/ld.c b/gnu/usr.bin/ld/ld.c index 8fafef1..cb59660 100644 --- a/gnu/usr.bin/ld/ld.c +++ b/gnu/usr.bin/ld/ld.c @@ -32,7 +32,7 @@ static char sccsid[] = "@(#)ld.c 6.10 (Berkeley) 5/22/91"; Set, indirect, and warning symbol features added by Randy Smith. */ /* - * $Id: ld.c,v 1.29 1995/07/13 08:30:07 rgrimes Exp $ + * $Id: ld.c,v 1.30 1995/09/28 19:43:20 bde Exp $ */ /* Define how to initialize system-dependent header fields. */ @@ -560,7 +560,7 @@ decode_command(argc, argv) /* Append the standard search directories to the user-specified ones. */ add_search_path(getenv("LD_LIBRARY_PATH")); - if (!nostdlib && getenv("LD_NOSTD_PATH") == NULL) + if (!nostdlib) std_search_path(); } diff --git a/gnu/usr.bin/ld/rtld/rtld.c b/gnu/usr.bin/ld/rtld/rtld.c index 8855d4e..3f6f7aa 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.27 1995/09/27 23:17:33 nate Exp $ + * $Id: rtld.c,v 1.28 1995/10/21 14:52:48 ache Exp $ */ #include <sys/param.h> @@ -264,14 +264,12 @@ struct _dynamic *dp; if (careful) { unsetenv("LD_LIBRARY_PATH"); - unsetenv("LD_NOSTD_PATH"); unsetenv("LD_PRELOAD"); } /* Setup directory search */ add_search_path(getenv("LD_LIBRARY_PATH")); - if (getenv("LD_NOSTD_PATH") == NULL) - std_search_path(); + std_search_path(); anon_open(); /* Load required objects into the process address space */ diff --git a/libexec/rtld-aout/rtld.c b/libexec/rtld-aout/rtld.c index 8855d4e..3f6f7aa 100644 --- a/libexec/rtld-aout/rtld.c +++ b/libexec/rtld-aout/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.27 1995/09/27 23:17:33 nate Exp $ + * $Id: rtld.c,v 1.28 1995/10/21 14:52:48 ache Exp $ */ #include <sys/param.h> @@ -264,14 +264,12 @@ struct _dynamic *dp; if (careful) { unsetenv("LD_LIBRARY_PATH"); - unsetenv("LD_NOSTD_PATH"); unsetenv("LD_PRELOAD"); } /* Setup directory search */ add_search_path(getenv("LD_LIBRARY_PATH")); - if (getenv("LD_NOSTD_PATH") == NULL) - std_search_path(); + std_search_path(); anon_open(); /* Load required objects into the process address space */ |
