Update.

1998-08-27 19:42  Ulrich Drepper  <drepper@cygnus.com>

	* elf/Makefile (distribute): Add dl-origin.h.
	* sysdeps/generic/dl-origin.h: New file.
	* sysdeps/unix/sysv/linux/dl-origin.h: New file.
	* elf/link.h (struct link_map): Add l_origin field.
	* elf/dl-load.c (expand_dynamic_string_token): New function.
	(decompose_path): Remove WHERE argument, take link map pointer instead.
	Call expand_dynamic_string_token instead of local_strdup to make copy
	of rpath.
	(_dl_init_paths): Call decompose_path with correct argument.
	(_dl_map_object_from_fd): Define static is EXTERNAL_MAP_FROM_FD is
	not defined.
	Check EI_OSABI and EI_ABIVERSION fields in header.
	(_dl_map_object): Call decompose_path with correct argument.
	Call expand_dynamic_string_token instead of local_strdup to also
	expand DST.
	* elf/dl-object.c (_dl_new_object): Determine l_origin for all maps
	but the main one.
	* elf/dl-support.c: Define _dl_origin_path.
	* elf/rtld.c: Likewise.  Set _dl_origin_path based on LD_ORIGIN_PATH.

	* elf/dl-close (_dl_close): Free l_name and l_origin.

	* sysdeps/i386/useldt.h (THREAD_GETMEM, THREAD_SETMEM): Use P
	modifier in asm, not c.

	* sysdeps/mach/hurd/Makefile [subdirs==elf]: Define CFLAGS-dl-load.c
	to -DEXTERNAL_MAP_FROM_FD to make _dl_map_object_from_fd extern.

1 files changed, 64 insertions, 0 deletions

diff --git a/elf/dl-object.c b/elf/dl-object.c
index ed4b059754..f2ef8163ce 100644
--- a/elf/dl-object.c
+++ b/elf/dl-object.c
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <elf/ldsodefs.h>
 
 #include <assert.h>
@@ -61,5 +62,68 @@ _dl_new_object (char *realname, const char *libname, int type)
       l->l_next = new;
     }
 
+  /* The REALNAME is "" for the main link map.  This name must be determined
+     specially.  */
+  if (realname[0] == '\0')
+    new->l_origin = NULL;
+  else
+    {
+      char *origin;
+
+      if (realname[0] == '/')
+	{
+	  /* It an absolute path.  Use it.  But we have to make a copy since
+	     we strip out the trailing slash.  */
+	  size_t len = strlen (realname) + 1;
+	  origin = malloc (len);
+	  if (origin == NULL)
+	    origin = (char *) -1;
+	  else
+	    memcpy (origin, realname, len);
+	}
+      else
+	{
+	  size_t realname_len = strlen (realname) + 1;
+	  size_t len = 128 + realname_len;
+	  char *result = NULL;
+
+	  /* Get the current directory name.  */
+	  origin = malloc (len);
+
+	  while (origin != NULL
+		 && (result = __getcwd (origin, len - realname_len)) == NULL
+		 && errno == ERANGE)
+	    {
+	      len += 128;
+	      origin = (char *) realloc (origin, len);
+	    }
+
+	  if (result == NULL)
+	    {
+	      /* We were not able to determine the current directory.  */
+	      if (origin != NULL)
+		free (origin);
+	      origin = (char *) -1;
+	    }
+	  else
+	    {
+	      /* Now append the filename.  */
+	      char *cp = strchr (origin, '\0');
+
+	      if (cp [-1] != '/')
+		*cp++ = '/';
+
+	      memcpy (cp, realname, realname_len);
+	    }
+	}
+
+      if (origin != (char *) -1)
+	/* Now remove the filename and the slash.  Do this even if the
+	   string is something like "/foo" which leaves an empty string.  */
+	*strrchr (origin, '/') = '\0';
+
+      new->l_origin = origin;
+    }
+
   return new;
 }