This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH][BZ #10253] Fix breaking of RPATH when $ORIGIN contains colons.
- From: Andreas Schwab <schwab at linux-m68k dot org>
- To: OndÅej BÃlka <neleai at seznam dot cz>
- Cc: libc-alpha at sourceware dot org
- Date: Sat, 26 Oct 2013 15:41:04 +0200
- Subject: Re: [PATCH][BZ #10253] Fix breaking of RPATH when $ORIGIN contains colons.
- Authentication-results: sourceware.org; auth=none
- References: <20131026072009 dot GA14530 at domone dot podge>
OndÅej BÃlka <neleai@seznam.cz> writes:
> + int check_trusted, const char *what, const char *where,
> + struct link_map *l)
Whitespace.
> {
> char *cp;
> size_t nelems = 0;
>
> + char *to_free;
> while ((cp = __strsep (&rpath, sep)) != NULL)
Whitespace.
> @@ -570,6 +577,7 @@ fillin_rpath (char *rpath, struct r_search_path_elem **result, const char *sep,
> /* Put it in the result array. */
> result[nelems++] = dirp;
> }
> + free (to_free);
Whitespace.
> @@ -627,7 +635,7 @@ decompose_rpath (struct r_search_path_struct *sps,
>
> /* Make a writable copy. At the same time expand possible dynamic
> string tokens. */
> - copy = expand_dynamic_string_token (l, rpath, 1);
> + copy = local_strdup(rpath);
Whitespace.
> @@ -865,7 +873,12 @@ _dl_init_paths (const char *llp)
>
> (void) fillin_rpath (llp_tmp, env_path_list.dirs, ":;",
> INTUSE(__libc_enable_secure), "LD_LIBRARY_PATH",
> - NULL);
> + NULL,
> +#ifdef SHARED
> + l);
> +#else
> + NULL);
> +#endif
Whitespace. Don't duplicate paren.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."