2000-12-08 Michael Snyder <msnyder@mvstp600e.cygnus.com>

[deliverable/binutils-gdb.git] / gdb / solib.c

diff --git a/gdb/solib.c b/gdb/solib.c
index 5c982e2a90dd78b172d52e5e541f69183a28c7e8..b8ffaa3d11bde8f01c7a7af16c2fcf71f7d7c9c0 100644 (file)
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -100,21 +100,25 @@ solib_open (char *in_pathname, char **found_pathname)
   int found_file = -1;
   char *temp_pathname = NULL;
 
-  if (solib_absolute_prefix != NULL &&
-      ROOTED_P (in_pathname))
+  if (ROOTED_P (in_pathname))
     {
-      int  prefix_len = strlen (solib_absolute_prefix);
+      if (solib_absolute_prefix == NULL)
+        temp_pathname = in_pathname;
+      else
+       {
+         int  prefix_len = strlen (solib_absolute_prefix);
 
-      /* Remove trailing slashes from absolute prefix.  */
-      while (prefix_len > 0 && SLASH_P (solib_absolute_prefix[prefix_len - 1]))
-       prefix_len--;
+         /* Remove trailing slashes from absolute prefix.  */
+         while (prefix_len > 0 && SLASH_P (solib_absolute_prefix[prefix_len - 1]))
+           prefix_len--;
 
-      /* Cat the prefixed pathname together.  */
-      temp_pathname = alloca (prefix_len + strlen (in_pathname) + 1);
-      strncpy (temp_pathname, solib_absolute_prefix, prefix_len);
-      temp_pathname[prefix_len] = '\0';
-      strcat (temp_pathname, in_pathname);
+         /* Cat the prefixed pathname together.  */
+         temp_pathname = alloca (prefix_len + strlen (in_pathname) + 1);
+         strncpy (temp_pathname, solib_absolute_prefix, prefix_len);
+         temp_pathname[prefix_len] = '\0';
+         strcat (temp_pathname, in_pathname);
 
+       }
       /* Now see if we can open it.  */
       found_file = open (temp_pathname, O_RDONLY, 0);
     }
@@ -137,7 +141,7 @@ solib_open (char *in_pathname, char **found_pathname)
 
   /* Done.  If not found, tough luck.  Return found_file and 
      (optionally) found_pathname.  */
-  if (found_pathname != NULL)
+  if (found_pathname != NULL && temp_pathname != NULL)
     *found_pathname = strsave (temp_pathname);
   return found_file;
 }
@@ -609,6 +613,11 @@ info_sharedlibrary_command (char *ignore, int from_tty)
       addr_width = 16 + 4;
       addr_fmt = "016l";
     }
+  else
+    {
+      internal_error ("%s:%d: bfd_get_arch_size() returned unknown size %d",
+                     __FILE__, __LINE__, arch_size);
+    }
 
   update_solib_list (from_tty, 0);