This is Paul K's latest set of ld changes. A commit was necessary at this

[unix-history] / gnu / usr.bin / ld / shlib.c

diff --git a/gnu/usr.bin/ld/shlib.c b/gnu/usr.bin/ld/shlib.c
index 55cd8c3..38ec051 100644 (file)
--- a/gnu/usr.bin/ld/shlib.c
+++ b/gnu/usr.bin/ld/shlib.c
@@ -1,5 +1,33 @@
 /*
 /*

- * $Id: shlib.c,v 1.4 1993/11/08 13:21:23 pk Exp $
+ * Copyright (c) 1993 Paul Kranenburg
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by Paul Kranenburg.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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.9 1994/01/29 02:03:15 jtc Exp $

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -11,23 +39,34 @@
 #include <sys/time.h>
 #include <fcntl.h>
 #include <string.h>
 #include <sys/time.h>
 #include <fcntl.h>
 #include <string.h>

+#include <ctype.h>

 #include <dirent.h>
 #include <a.out.h>
 
 #include "ld.h"
 
 #include <dirent.h>
 #include <a.out.h>
 
 #include "ld.h"
 

+#ifdef SUNOS4
+char   *strsep();
+#endif
+

 /*
  * Standard directories to search for files specified by -l.
  */
 #ifndef STANDARD_SEARCH_DIRS
 /*
  * Standard directories to search for files specified by -l.
  */
 #ifndef STANDARD_SEARCH_DIRS

-#define        STANDARD_SEARCH_DIRS    "/usr/lib", "/usr/local/lib"
+#define        STANDARD_SEARCH_DIRS    "/usr/lib", "/usr/X386/lib", "/usr/local/lib"

 #endif
 
 #endif
 

+/*
+ * Actual vector of library search directories,
+ * including `-L'ed and LD_LIBARAY_PATH spec'd ones.
+ */
+char    **search_dirs;
+int    n_search_dirs;
+

 char *standard_search_dirs[] = {
        STANDARD_SEARCH_DIRS
 };
 
 char *standard_search_dirs[] = {
        STANDARD_SEARCH_DIRS
 };
 

-int n_search_dirs;

 
 void
 add_search_dir(name)
 
 void
 add_search_dir(name)


@@ -132,9 +171,10 @@ int        n1, n2;
 #undef minor
 
 char *
 #undef minor
 
 char *

-findshlib(name, majorp, minorp)
+findshlib(name, majorp, minorp, do_dot_a)

 char   *name;
 int    *majorp, *minorp;
 char   *name;
 int    *majorp, *minorp;

+int    do_dot_a;

 {
        int             dewey[MAXDEWEY];
        int             ndewey;
 {
        int             dewey[MAXDEWEY];
        int             ndewey;


@@ -154,6 +194,7 @@ int *majorp, *minorp;
        for (i = 0; i < n_search_dirs; i++) {
                DIR             *dd = opendir(search_dirs[i]);
                struct dirent   *dp;
        for (i = 0; i < n_search_dirs; i++) {
                DIR             *dd = opendir(search_dirs[i]);
                struct dirent   *dp;

+               int             found_dot_a = 0;

 
                if (dd == NULL)
                        continue;
 
                if (dd == NULL)
                        continue;


@@ -161,6 +202,16 @@ int        *majorp, *minorp;
                while ((dp = readdir(dd)) != NULL) {
                        int     n, j, might_take_it = 0;
 
                while ((dp = readdir(dd)) != NULL) {
                        int     n, j, might_take_it = 0;
 

+                       if (do_dot_a && path == NULL &&
+                                       dp->d_namlen == len + 2 &&
+                                       strncmp(dp->d_name, lname, len) == 0 &&
+                                       (dp->d_name+len)[0] == '.' &&
+                                       (dp->d_name+len)[1] == 'a') {
+
+                               path = concat(search_dirs[i], "/", dp->d_name);
+                               found_dot_a = 1;
+                       }
+

                        if (dp->d_namlen < len + 4)
                                continue;
                        if (strncmp(dp->d_name, lname, len) != 0)
                        if (dp->d_namlen < len + 4)
                                continue;
                        if (strncmp(dp->d_name, lname, len) != 0)


@@ -171,6 +222,12 @@ int        *majorp, *minorp;
                        if ((n = getdewey(tmp, dp->d_name+len+4)) == 0)
                                continue;
 
                        if ((n = getdewey(tmp, dp->d_name+len+4)) == 0)
                                continue;
 

+                       if (major != -1 && found_dot_a) { /* XXX */
+                               free(path);
+                               path = NULL;
+                               found_dot_a = 0;
+                       }
+

                        if (major == -1 && minor == -1) {
                                might_take_it = 1;
                        } else if (major != -1 && minor == -1) {
                        if (major == -1 && minor == -1) {
                                might_take_it = 1;
                        } else if (major != -1 && minor == -1) {


@@ -192,12 +249,19 @@ int       *majorp, *minorp;
                        if (path)
                                free(path);
                        path = concat(search_dirs[i], "/", dp->d_name);
                        if (path)
                                free(path);
                        path = concat(search_dirs[i], "/", dp->d_name);

+                       found_dot_a = 0;

                        bcopy(tmp, dewey, sizeof(dewey));
                        ndewey = n;
                        *majorp = dewey[0];
                        *minorp = dewey[1];
                }
                closedir(dd);
                        bcopy(tmp, dewey, sizeof(dewey));
                        ndewey = n;
                        *majorp = dewey[0];
                        *minorp = dewey[1];
                }
                closedir(dd);

+
+               if (found_dot_a)
+                       /*
+                        * There's a .a archive here.
+                        */
+                       return path;

        }
 
        return path;
        }
 
        return path;