[PING][PATCH] Use exec_file_find to prepend gdb_sysroot in follow_exec

[Gary Benson <gbenson at redhat dot com>]

Ping:
https://sourceware.org/ml/gdb-patches/2015-04/msg00674.html

Gary Benson wrote:
> Hi all,
> 
> This commit updates follow_exec to use exec_file_find to prefix
> the new executable's filename with gdb_sysroot rather than doing
> it longhand.
> 
> Built and regtested on RHEL6.6 x86_64.
> 
> Ok to commit?
> 
> Cheers,
> Gary
> 
> 
> gdb/ChangeLog:
> 
> 	* infrun.c (solist.h): New include.
> 	(follow_exec): Use exec_file_find to prefix execd_pathname
> 	with gdb_sysroot.
> ---
>  gdb/ChangeLog |    6 ++++++
>  gdb/infrun.c  |   18 +++++++++++-------
>  2 files changed, 17 insertions(+), 7 deletions(-)
> 
> diff --git a/gdb/infrun.c b/gdb/infrun.c
> index 7870f70..f09e2da 100644
> --- a/gdb/infrun.c
> +++ b/gdb/infrun.c
> @@ -60,6 +60,7 @@
>  #include "target-descriptions.h"
>  #include "target-dcache.h"
>  #include "terminal.h"
> +#include "solist.h"
>  
>  /* Prototypes for local functions */
>  
> @@ -1133,15 +1134,18 @@ follow_exec (ptid_t ptid, char *execd_pathname)
>  
>    breakpoint_init_inferior (inf_execd);
>  
> -  if (gdb_sysroot && *gdb_sysroot)
> +  if (gdb_sysroot != NULL && *gdb_sysroot != '\0')
>      {
> -      char *name = alloca (strlen (gdb_sysroot)
> -			    + strlen (execd_pathname)
> -			    + 1);
> +      int fd = -1;
> +      char *name;
>  
> -      strcpy (name, gdb_sysroot);
> -      strcat (name, execd_pathname);
> -      execd_pathname = name;
> +      name = exec_file_find (execd_pathname, &fd);
> +      if (fd >= 0)
> +	close (fd);
> +
> +      execd_pathname = alloca (strlen (name) + 1);
> +      strcpy (execd_pathname, name);
> +      xfree (name);
>      }
>  
>    /* Reset the shared library package.  This ensures that we get a
> -- 
> 1.7.1
> 

-- 
http://gbenson.net/