X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=libiberty%2Fmake-relative-prefix.c;h=fe639d18bd2815a5ec33aef28720386725ab1bd5;hb=c88960d081f0b37ec03c66a13115e2a68e40d1ad;hp=66ddcaa471bf029b921c87fd7f397663aff830a6;hpb=abf6a75b428517d9caaf9155212b0b10e0379a99;p=deliverable%2Fbinutils-gdb.git diff --git a/libiberty/make-relative-prefix.c b/libiberty/make-relative-prefix.c index 66ddcaa471..fe639d18bd 100644 --- a/libiberty/make-relative-prefix.c +++ b/libiberty/make-relative-prefix.c @@ -1,6 +1,6 @@ /* Relative (relocatable) prefix support. Copyright (C) 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + 1999, 2000, 2001, 2002, 2006, 2012 Free Software Foundation, Inc. This file is part of libiberty. @@ -21,7 +21,8 @@ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA /* -@deftypefn Extension {const char*} make_relative_prefix (const char *@var{progname}, const char *@var{bin_prefix}, const char *@var{prefix}) +@deftypefn Extension {const char*} make_relative_prefix (const char *@var{progname}, @ + const char *@var{bin_prefix}, const char *@var{prefix}) Given three paths @var{progname}, @var{bin_prefix}, @var{prefix}, return the path that is in the same position relative to @@ -57,6 +58,9 @@ relative prefix can be found, return @code{NULL}. #ifdef HAVE_UNISTD_H #include #endif +#ifdef HAVE_SYS_STAT_H +#include +#endif #include @@ -201,10 +205,13 @@ free_split_directories (char **dirs) { int i = 0; - while (dirs[i] != NULL) - free (dirs[i++]); + if (dirs != NULL) + { + while (dirs[i] != NULL) + free (dirs[i++]); - free ((char *) dirs); + free ((char *) dirs); + } } /* Given three strings PROGNAME, BIN_PREFIX, PREFIX, return a string that gets @@ -217,15 +224,15 @@ free_split_directories (char **dirs) If no relative prefix can be found, return NULL. */ -char * -make_relative_prefix (const char *progname, - const char *bin_prefix, const char *prefix) +static char * +make_relative_prefix_1 (const char *progname, const char *bin_prefix, + const char *prefix, const int resolve_links) { - char **prog_dirs, **bin_dirs, **prefix_dirs; + char **prog_dirs = NULL, **bin_dirs = NULL, **prefix_dirs = NULL; int prog_num, bin_num, prefix_num; int i, n, common; int needed_len; - char *ret, *ptr, *full_progname = NULL; + char *ret = NULL, *ptr, *full_progname; if (progname == NULL || bin_prefix == NULL || prefix == NULL) return NULL; @@ -241,10 +248,15 @@ make_relative_prefix (const char *progname, { 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) @@ -259,7 +271,7 @@ make_relative_prefix (const char *progname, } else { - strncpy (nstore, startp, endp - startp); + memcpy (nstore, startp, endp - startp); if (! IS_DIR_SEPARATOR (endp[-1])) { nstore[endp - startp] = DIR_SEPARATOR; @@ -275,8 +287,14 @@ make_relative_prefix (const char *progname, #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) @@ -289,16 +307,22 @@ make_relative_prefix (const char *progname, } } - full_progname = lrealpath (progname); + if (resolve_links) + full_progname = lrealpath (progname); + else + full_progname = strdup (progname); if (full_progname == NULL) return NULL; prog_dirs = split_directories (full_progname, &prog_num); - bin_dirs = split_directories (bin_prefix, &bin_num); free (full_progname); - if (bin_dirs == NULL || prog_dirs == NULL) + if (prog_dirs == NULL) return NULL; + bin_dirs = split_directories (bin_prefix, &bin_num); + if (bin_dirs == NULL) + goto bailout; + /* Remove the program name from comparison of directory names. */ prog_num--; @@ -315,21 +339,12 @@ make_relative_prefix (const char *progname, } if (prog_num <= 0 || i == bin_num) - { - free_split_directories (prog_dirs); - free_split_directories (bin_dirs); - prog_dirs = bin_dirs = (char **) 0; - return NULL; - } + goto bailout; } prefix_dirs = split_directories (prefix, &prefix_num); if (prefix_dirs == NULL) - { - free_split_directories (prog_dirs); - free_split_directories (bin_dirs); - return NULL; - } + goto bailout; /* Find how many directories are in common between bin_prefix & prefix. */ n = (prefix_num < bin_num) ? prefix_num : bin_num; @@ -341,12 +356,7 @@ make_relative_prefix (const char *progname, /* If there are no common directories, there can be no relative prefix. */ if (common == 0) - { - free_split_directories (prog_dirs); - free_split_directories (bin_dirs); - free_split_directories (prefix_dirs); - return NULL; - } + goto bailout; /* Two passes: first figure out the size of the result string, and then construct it. */ @@ -360,7 +370,7 @@ make_relative_prefix (const char *progname, ret = (char *) malloc (needed_len); if (ret == NULL) - return NULL; + goto bailout; /* Build up the pathnames in argv[0]. */ *ret = '\0'; @@ -381,9 +391,37 @@ make_relative_prefix (const char *progname, for (i = common; i < prefix_num; i++) strcat (ret, prefix_dirs[i]); + bailout: free_split_directories (prog_dirs); free_split_directories (bin_dirs); free_split_directories (prefix_dirs); return ret; } + + +/* Do the full job, including symlink resolution. + This path will find files installed in the same place as the + program even when a soft link has been made to the program + from somwhere else. */ + +char * +make_relative_prefix (const char *progname, const char *bin_prefix, + const char *prefix) +{ + return make_relative_prefix_1 (progname, bin_prefix, prefix, 1); +} + +/* Make the relative pathname without attempting to resolve any links. + '..' etc may also be left in the pathname. + This will find the files the user meant the program to find if the + 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); +} +