Update.

2002-02-03  Andreas Schwab  <schwab@suse.de>

	* sysdeps/posix/readv.c: Use ssize_t for bytes_read.
	* sysdeps/posix/writev.c: Use ssize_t for bytes_written.  Fix comment.

2002-02-03  Thorsten Kukuk  <kukuk@suse.de>

	* sysdeps/posix/writev.c: Check for ssize_t overflow, don't use
	alloca if the memory reqirements are too high.

2002-02-03  Ulrich Drepper  <drepper@redhat.com>

	* elf/dl-load.c (decompose_rpath): Avoid using strstr.
	* elf/dl-minimal.c (_strerror_r): Use _itoa instead of _itoa_word since
	the former is available anyway and speed isn't important here.
	* elf/dl-misc.c (_dl_debug_vdprintf): Likewise.
	* elf/dl-version.c (match_symbol): Likewise.
	(_dl_check_map_versions): Likewise.
	* elf/rtld.c (process_envvars): Likewise.
	(print_statistics): Likewise.
	* sysdeps/generic/dl-sysdep.c (_dl_show_auxv): Likewise.
	* elf/dl-minimal.c (_itoa): Always define it.  Make it work for all
	bases.  Add assert to catch uses of unimplemented features.
	(__strsep): Add assert to catch uses of unimplemented features.
	* elf/dl-object.c (_dl_new_object): Don't use rawmemchr.  Use strchr
	and avoid inline optimization.
	* elf/rtld.c (process_envvars): Likewise.
	* elf/dl-open.c: Don't include <stdio-common/_itoa.h>.
	* elf/dl-profile.c (_dl_start_profile): Help compiler to avoid ffs.
	* elf/rtld.c (dl_main): Avoid strsep inline optimization.

	* stdio-common/_itoa.h: Minor simplifications of the code.
	* stdio-common/_itoa.c: Likewise.

	* elf/dl-reloc.c (_dl_relocate_object): Use _dl_debug_printf
	instead of _dl_printf for debugging info output.

	* sysdeps/mips/atomicity.h (exchange_and_add): Use branch likely.

1 files changed, 17 insertions, 5 deletions

diff --git a/elf/dl-load.c b/elf/dl-load.c
index 574d4da..cf64ebc 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -496,12 +496,19 @@ decompose_rpath (struct r_search_path_struct *sps,
   if (__builtin_expect (GL(dl_inhibit_rpath) != NULL, 0)
       && !__libc_enable_secure)
     {
-      const char *found = strstr (GL(dl_inhibit_rpath), where);
-      if (found != NULL)
+      const char *inhp = GL(dl_inhibit_rpath);
+
+      do
 	{
-	  size_t len = strlen (where);
-	  if ((found == GL(dl_inhibit_rpath) || found[-1] == ':')
-	      && (found[len] == '\0' || found[len] == ':'))
+	  const char *wp = where;
+
+	  while (*inhp == *wp && *wp != '\0')
+	    {
+	      ++inhp;
+	      ++wp;
+	    }
+
+	  if (*wp == '\0' && (*inhp == '\0' || *inhp == ':'))
 	    {
 	      /* This object is on the list of objects for which the
 		 RUNPATH and RPATH must not be used.  */
@@ -522,7 +529,12 @@ decompose_rpath (struct r_search_path_struct *sps,
 
 	      return;
 	    }
+
+	  while (*inhp != '\0')
+	    if (*inhp++ == ':')
+	      break;
 	}
+      while (*inhp != '\0');
     }
 
   /* Make a writable copy.  At the same time expand possible dynamic