Merge GDB 7.5.1

libiberty/make-relative-prefix.c

 /* Relative (relocatable) prefix support.
    Copyright (C) 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002, 2006 Free Software Foundation, Inc.
+   1999, 2000, 2001, 2002, 2006, 2012 Free Software Foundation, Inc.
 
 This file is part of libiberty.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 Software Foundation; either version 2, or (at your option) any later
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ skipping 37 matching lines @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
 
 #include <string.h>
 
 #include "ansidecl.h"
 #include "libiberty.h"
 
 #ifndef R_OK
 #define R_OK 4
 #define W_OK 2
 #define X_OK 1
@@ skipping 167 matching lines @@
      of the directories specified in the PATH environment variable.  */
   if (lbasename (progname) == progname)
     {
       char *temp;
 
       temp = getenv ("PATH");
       if (temp)
         {
           char *startp, *endp, *nstore;
           size_t prefixlen = strlen (temp) + 1;
+          size_t len;
           if (prefixlen < 2)
             prefixlen = 2;
 
-          nstore = (char *) alloca (prefixlen + strlen (progname) + 1);
+          len = prefixlen + strlen (progname) + 1;
+#ifdef HAVE_HOST_EXECUTABLE_SUFFIX
+          len += strlen (HOST_EXECUTABLE_SUFFIX);
+#endif
+          nstore = (char *) alloca (len);
 
           startp = endp = temp;
           while (1)
             {
               if (*endp == PATH_SEPARATOR || *endp == 0)
                 {
                   if (endp == startp)
                     {
                       nstore[0] = '.';
                       nstore[1] = DIR_SEPARATOR;
                       nstore[2] = '\0';
                     }
                   else
                     {
-                      strncpy (nstore, startp, endp - startp);
+                      memcpy (nstore, startp, endp - startp);
                       if (! IS_DIR_SEPARATOR (endp[-1]))
                         {
                           nstore[endp - startp] = DIR_SEPARATOR;
                           nstore[endp - startp + 1] = 0;
                         }
                       else
                         nstore[endp - startp] = 0;
                     }
                   strcat (nstore, progname);
                   if (! access (nstore, X_OK)
 #ifdef HAVE_HOST_EXECUTABLE_SUFFIX
                       || ! access (strcat (nstore, HOST_EXECUTABLE_SUFFIX), X_OK)
 #endif
                       )
                     {
-                      progname = nstore;
-                      break;
+#if defined (HAVE_SYS_STAT_H) && defined (S_ISREG)
+                      struct stat st;
+                      if (stat (nstore, &st) >= 0 && S_ISREG (st.st_mode))
+#endif
+                        {
+                          progname = nstore;
+                          break;
+                        }
                     }
 
                   if (*endp == 0)
                     break;
                   endp = startp = endp + 1;
                 }
               else
                 endp++;
             }
         }
@@ skipping 110 matching lines @@
    installation is patched together with soft links. */
 
 char *
 make_relative_prefix_ignore_links (const char *progname,
                                    const char *bin_prefix,
                                    const char *prefix)
 {
   return make_relative_prefix_1 (progname, bin_prefix, prefix, 0);
 }