* g++.dg/crash38.C: moved into proper directory...

[pf3gnuchains/gcc-fork.git] / gcc / prefix.c

diff --git a/gcc/prefix.c b/gcc/prefix.c
index c8f0b98..476e996 100644 (file)
--- a/gcc/prefix.c
+++ b/gcc/prefix.c
@@ -1,5 +1,5 @@
 /* Utility to update paths from internal to external forms.
 /* Utility to update paths from internal to external forms.

-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005

    Free Software Foundation, Inc.
 
 This file is part of GCC.
    Free Software Foundation, Inc.
 
 This file is part of GCC.


@@ -16,8 +16,8 @@ Library General Public License for more details.
 
 You should have received a copy of the GNU Library General Public
 License along with GCC; see the file COPYING.  If not, write to the Free
 
 You should have received a copy of the GNU Library General Public
 License along with GCC; see the file COPYING.  If not, write to the Free

-Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */

 
 /* This file contains routines to update a path, both to canonicalize
    the directory format and to handle any prefix translation.
 
 /* This file contains routines to update a path, both to canonicalize
    the directory format and to handle any prefix translation.


@@ -67,6 +67,8 @@ Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
 #include "system.h"
 
 #include "config.h"
 #include "system.h"

+#include "coretypes.h"
+#include "tm.h"

 #if defined(_WIN32) && defined(ENABLE_WIN32_REGISTRY)
 #include <windows.h>
 #endif
 #if defined(_WIN32) && defined(ENABLE_WIN32_REGISTRY)
 #include <windows.h>
 #endif


@@ -74,21 +76,20 @@ Boston, MA 02111-1307, USA.  */
 
 static const char *std_prefix = PREFIX;
 
 
 static const char *std_prefix = PREFIX;
 

-static const char *get_key_value       PARAMS ((char *));
-static char *translate_name            PARAMS ((char *));
-static char *save_string               PARAMS ((const char *, int));
-static void tr                         PARAMS ((char *, int, int));
+static const char *get_key_value (char *);
+static char *translate_name (char *);
+static char *save_string (const char *, int);
+static void tr (char *, int, int);

 
 #if defined(_WIN32) && defined(ENABLE_WIN32_REGISTRY)
 
 #if defined(_WIN32) && defined(ENABLE_WIN32_REGISTRY)

-static char *lookup_key                PARAMS ((char *));
+static char *lookup_key (char *);

 static HKEY reg_key = (HKEY) INVALID_HANDLE_VALUE;
 #endif
 
 /* Given KEY, as above, return its value.  */
 
 static const char *
 static HKEY reg_key = (HKEY) INVALID_HANDLE_VALUE;
 #endif
 
 /* Given KEY, as above, return its value.  */
 
 static const char *

-get_key_value (key)
-     char *key;
+get_key_value (char *key)

 {
   const char *prefix = 0;
   char *temp = 0;
 {
   const char *prefix = 0;
   char *temp = 0;


@@ -112,9 +113,7 @@ get_key_value (key)
 /* Return a copy of a string that has been placed in the heap.  */
 
 static char *
 /* Return a copy of a string that has been placed in the heap.  */
 
 static char *

-save_string (s, len)
-  const char *s;
-  int len;
+save_string (const char *s, int len)

 {
   char *result = xmalloc (len + 1);
 
 {
   char *result = xmalloc (len + 1);
 


@@ -125,11 +124,14 @@ save_string (s, len)
 
 #if defined(_WIN32) && defined(ENABLE_WIN32_REGISTRY)
 
 
 #if defined(_WIN32) && defined(ENABLE_WIN32_REGISTRY)
 

+#ifndef WIN32_REGISTRY_KEY
+# define WIN32_REGISTRY_KEY BASEVER
+#endif
+

 /* Look up "key" in the registry, as above.  */
 
 static char *
 /* Look up "key" in the registry, as above.  */
 
 static char *

-lookup_key (key)
-     char *key;
+lookup_key (char *key)

 {
   char *dst;
   DWORD size;
 {
   char *dst;
   DWORD size;


@@ -157,13 +159,13 @@ lookup_key (key)
     }
 
   size = 32;
     }
 
   size = 32;

-  dst = (char *) xmalloc (size);
+  dst = xmalloc (size);

 
 

-  res = RegQueryValueExA (reg_key, key, 0, &type, dst, &size);
+  res = RegQueryValueExA (reg_key, key, 0, &type, (LPBYTE) dst, &size);

   if (res == ERROR_MORE_DATA && type == REG_SZ)
     {
   if (res == ERROR_MORE_DATA && type == REG_SZ)
     {

-      dst = (char *) xrealloc (dst, size);
-      res = RegQueryValueExA (reg_key, key, 0, &type, dst, &size);
+      dst = xrealloc (dst, size);
+      res = RegQueryValueExA (reg_key, key, 0, &type, (LPBYTE) dst, &size);

     }
 
   if (type != REG_SZ || res != ERROR_SUCCESS)
     }
 
   if (type != REG_SZ || res != ERROR_SUCCESS)


@@ -181,8 +183,7 @@ lookup_key (key)
    Otherwise, return the given name.  */
 
 static char *
    Otherwise, return the given name.  */
 
 static char *

-translate_name (name)
-     char *name;
+translate_name (char *name)

 {
   char code;
   char *key, *old_name;
 {
   char code;
   char *key, *old_name;


@@ -200,7 +201,7 @@ translate_name (name)
           keylen++)
        ;
 
           keylen++)
        ;
 

-      key = (char *) alloca (keylen + 1);
+      key = alloca (keylen + 1);

       strncpy (key, &name[1], keylen);
       key[keylen] = 0;
 
       strncpy (key, &name[1], keylen);
       key[keylen] = 0;
 


@@ -231,9 +232,7 @@ translate_name (name)
 
 /* In a NUL-terminated STRING, replace character C1 with C2 in-place.  */
 static void
 
 /* In a NUL-terminated STRING, replace character C1 with C2 in-place.  */
 static void

-tr (string, c1, c2)
-     char *string;
-     int c1, c2;
+tr (char *string, int c1, int c2)

 {
   do
     {
 {
   do
     {


@@ -243,18 +242,20 @@ tr (string, c1, c2)
   while (*string++);
 }
 
   while (*string++);
 }
 

-/* Update PATH using KEY if PATH starts with PREFIX.  The returned
-   string is always malloc-ed, and the caller is responsible for
-   freeing it.  */
+/* Update PATH using KEY if PATH starts with PREFIX as a directory.
+   The returned string is always malloc-ed, and the caller is
+   responsible for freeing it.  */

 
 char *
 
 char *

-update_path (path, key)
-  const char *path;
-  const char *key;
+update_path (const char *path, const char *key)

 {
   char *result, *p;
 {
   char *result, *p;

+  const int len = strlen (std_prefix);

 
 

-  if (! strncmp (path, std_prefix, strlen (std_prefix)) && key != 0)
+  if (! strncmp (path, std_prefix, len)
+      && (IS_DIR_SEPARATOR(path[len])
+          || path[len] == '\0')
+      && key != 0)

     {
       bool free_key = false;
 
     {
       bool free_key = false;
 


@@ -264,7 +265,7 @@ update_path (path, key)
          free_key = true;
        }
 
          free_key = true;
        }
 

-      result = concat (key, &path[strlen (std_prefix)], NULL);
+      result = concat (key, &path[len], NULL);

       if (free_key)
        free ((char *) key);
       result = translate_name (result);
       if (free_key)
        free ((char *) key);
       result = translate_name (result);


@@ -284,43 +285,39 @@ update_path (path, key)
       p = strchr (p, '.');
       if (p == NULL)
        break;
       p = strchr (p, '.');
       if (p == NULL)
        break;

-      /* Get rid of a leading `./' and replace `/./' with `/'.  */
-      if (IS_DIR_SEPARATOR (p[1])
-         && (p == result || IS_DIR_SEPARATOR (p[-1])))
-       {
-         src = p + 2;
-         /* Be careful about .//foo  */
-         while (IS_DIR_SEPARATOR (*src))
-           ++src;
-         dest = p;
-         while ((*dest++ = *src++) != 0)
-           ;
-       }

       /* Look for `/../'  */
       /* Look for `/../'  */

-      else if (p[1] == '.'
-              && IS_DIR_SEPARATOR (p[2])
-              && (p != result && IS_DIR_SEPARATOR (p[-1])))
+      if (p[1] == '.'
+         && IS_DIR_SEPARATOR (p[2])
+         && (p != result && IS_DIR_SEPARATOR (p[-1])))

        {
          *p = 0;
          if (!ALWAYS_STRIP_DOTDOT && access (result, X_OK) == 0)
            {
              *p = '.';
        {
          *p = 0;
          if (!ALWAYS_STRIP_DOTDOT && access (result, X_OK) == 0)
            {
              *p = '.';

-             p += 3;
+             break;

            }
          else
            {
              /* We can't access the dir, so we won't be able to
            }
          else
            {
              /* We can't access the dir, so we won't be able to

-                access dir/.. either.  Strip out dir/..  We know dir
-                isn't `.' because we've rid ourselves of `.' path
-                components above.  */
-             dest = p - 1;
-             while (dest != result && IS_DIR_SEPARATOR (*dest))
-               --dest;
-             while (dest != result && IS_DIR_SEPARATOR (dest[-1]))
-               --dest;
-             /* Don't strip leading `/'.  */
-             while (IS_DIR_SEPARATOR (*dest))
-               ++dest;
+                access dir/.. either.  Strip out `dir/../'.  If `dir'
+                turns out to be `.', strip one more path component.  */
+             dest = p;
+             do
+               {
+                 --dest;
+                 while (dest != result && IS_DIR_SEPARATOR (*dest))
+                   --dest;
+                 while (dest != result && !IS_DIR_SEPARATOR (dest[-1]))
+                   --dest;
+               }
+             while (dest != result && *dest == '.');
+             /* If we have something like `./..' or `/..', don't
+                strip anything more.  */
+             if (*dest == '.' || IS_DIR_SEPARATOR (*dest))
+               {
+                 *p = '.';
+                 break;
+               }

              src = p + 3;
              while (IS_DIR_SEPARATOR (*src))
                ++src;
              src = p + 3;
              while (IS_DIR_SEPARATOR (*src))
                ++src;


@@ -352,11 +349,9 @@ update_path (path, key)
   return result;
 }
 
   return result;
 }
 

-/* Reset the standard prefix */
+/* Reset the standard prefix.  */

 void
 void

-set_std_prefix (prefix, len)
-  const char *prefix;
-  int len;
+set_std_prefix (const char *prefix, int len)

 {
   std_prefix = save_string (prefix, len);
 }
 {
   std_prefix = save_string (prefix, len);
 }