gcc/

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

diff --git a/gcc/prefix.c b/gcc/prefix.c
index a7b9740..7b92ce5 100644 (file)
--- a/gcc/prefix.c
+++ b/gcc/prefix.c
@@ -1,5 +1,5 @@
 /* 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.
@@ -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
-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.
@@ -76,21 +76,20 @@ Boston, MA 02111-1307, USA.  */
 
 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)
-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 *
-get_key_value (key)
-     char *key;
+get_key_value (char *key)
 {
   const char *prefix = 0;
   char *temp = 0;
@@ -114,11 +113,9 @@ get_key_value (key)
 /* 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 = XNEWVEC (char, len + 1);
 
   memcpy (result, s, len);
   result[len] = 0;
@@ -127,11 +124,14 @@ save_string (s, len)
 
 #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 *
-lookup_key (key)
-     char *key;
+lookup_key (char *key)
 {
   char *dst;
   DWORD size;
@@ -159,13 +159,13 @@ lookup_key (key)
     }
 
   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)
     {
-      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)
@@ -183,8 +183,7 @@ lookup_key (key)
    Otherwise, return the given name.  */
 
 static char *
-translate_name (name)
-     char *name;
+translate_name (char *name)
 {
   char code;
   char *key, *old_name;
@@ -233,9 +232,7 @@ translate_name (name)
 
 /* 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
     {
@@ -245,18 +242,20 @@ tr (string, c1, c2)
   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 *
-update_path (path, key)
-  const char *path;
-  const char *key;
+update_path (const char *path, const char *key)
 {
   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;
 
@@ -266,7 +265,7 @@ update_path (path, key)
          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);
@@ -352,9 +351,7 @@ update_path (path, key)
 
 /* Reset the standard prefix.  */
 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);
 }