diff options
| author | nate <nate@FreeBSD.org> | 1994-12-23 22:31:35 +0000 |
|---|---|---|
| committer | nate <nate@FreeBSD.org> | 1994-12-23 22:31:35 +0000 |
| commit | 7f56eb7b93f7774321c3f5924447d96ffcb858b9 (patch) | |
| tree | 44d4ecee16a0e6d497426a41a2bdd4542c4c3342 /libexec/rtld-aout/shlib.c | |
| parent | 92495f8331471c4b72fe0037463cdac16b87b02e (diff) | |
| download | FreeBSD-src-7f56eb7b93f7774321c3f5924447d96ffcb858b9.zip FreeBSD-src-7f56eb7b93f7774321c3f5924447d96ffcb858b9.tar.gz | |
Updated to recent version of Paul K.'s shlib code. This code has better
warning handling and allows for link-time warnings with a modified
version of gas.
Note: Not all of the newer bits were updated such as some of the non-x86
machine-dependant code is relevant to FreeBSD right now.
Obtained from: NetBSD
Diffstat (limited to 'libexec/rtld-aout/shlib.c')
| -rw-r--r-- | libexec/rtld-aout/shlib.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libexec/rtld-aout/shlib.c b/libexec/rtld-aout/shlib.c index 2e8dfe9..4ea4b85 100644 --- a/libexec/rtld-aout/shlib.c +++ b/libexec/rtld-aout/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: shlib.c,v 1.8 1994/02/13 20:41:43 jkh Exp $ + * $Id: shlib.c,v 1.9 1994/06/15 22:39:54 rich Exp $ */ #include <sys/param.h> @@ -54,7 +54,7 @@ char *strsep(); * Standard directories to search for files specified by -l. */ #ifndef STANDARD_SEARCH_DIRS -#define STANDARD_SEARCH_DIRS "/usr/lib", "/usr/X11R6/lib", "/usr/X386/lib", "/usr/local/lib" +#define STANDARD_SEARCH_DIRS "/usr/lib" #endif /* @@ -64,7 +64,7 @@ char *strsep(); char **search_dirs; int n_search_dirs; -char *standard_search_dirs[] = { +char *standard_search_dirs[] = { STANDARD_SEARCH_DIRS }; @@ -88,12 +88,12 @@ char *path; if (path == NULL) return; - /* Add search directories from `paths' */ + /* Add search directories from `paths' */ while ((cp = strsep(&path, ":")) != NULL) { - add_search_dir(cp); + add_search_dir(cp); if (path) *(path-1) = ':'; - } + } } void |
