[PATCH v2][BZ #10253] Fix breaking of RPATH when $ORIGIN contains colons.

[Ondřej Bílka]

On Mon, Nov 18, 2013 at 11:39:05PM +0100, Ondřej Bílka wrote:
> On Mon, Nov 18, 2013 at 05:05:10PM -0500, Carlos O'Donell wrote:
> > On 11/18/2013 04:45 PM, Paul Pluzhnikov wrote:
> > > On Mon, Nov 18, 2013 at 10:23 AM, Carlos O'Donell <carlos@redhat.com> wrote:
> > > 
> > >> This looks good to me.
> > > 
> > > Build break on Linux/x86_64:
> > > 
> > > dl-load.c:495:7: error: too few arguments to function
> > > ‘expand_dynamic_string_token’
> > >        to_free = cp = expand_dynamic_string_token (l, cp);
> > >        ^
> > > dl-load.c:414:1: note: declared here
> > >  expand_dynamic_string_token (struct link_map *l, const char *s, int is_path)
> > >  ^
> > 
> > Paul,
> > 
> > Thanks for that. I also see the same build breakage. If you have commit
> > rights please feel free to immediately revert the patch since that's our
> > policy for glibc.
> > 
> > https://sourceware.org/glibc/wiki/Consensus -> Bad Changes.
> > 
> > 
> > Ondrej,
> > 
> > Could you please coordinate with Paul and get this fixed? Please make
> > sure you test your changes before checking them in. I missed the
> > missing is_path in my review.
> >
> A fix that I did when I tested patch but forgoten is this, will Paul
> revert or should I do this? It needs rechecking.
>  
> @@ -492,7 +492,7 @@ fillin_rpath (char *rpath, struct r_search_path_elem
> **result, const char *sep,
>      {
>        struct r_search_path_elem *dirp;
>  
> -      to_free = cp = expand_dynamic_string_token (l, cp);
> +      to_free = cp = expand_dynamic_string_token (l, cp, 1);
>  
>        size_t len = strlen (cp);

Reverted a elf/dl-load.c code for now.