projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mi_make_breakpoint: add "evaluated-by" option
[deliverable/binutils-gdb.git]
/
libiberty
/
make-relative-prefix.c
diff --git
a/libiberty/make-relative-prefix.c
b/libiberty/make-relative-prefix.c
index 037809e34edfabbf5288ece771676e227b64a098..fe639d18bd2815a5ec33aef28720386725ab1bd5 100644
(file)
--- 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,
/* 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.
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
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 <unistd.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
#include <string.h>
#include <string.h>
@@
-201,10
+205,13
@@
free_split_directories (char **dirs)
{
int i = 0;
{
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
}
/* Given three strings PROGNAME, BIN_PREFIX, PREFIX, return a string that gets
@@
-221,11
+228,11
@@
static char *
make_relative_prefix_1 (const char *progname, const char *bin_prefix,
const char *prefix, const int resolve_links)
{
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;
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;
if (progname == NULL || bin_prefix == NULL || prefix == NULL)
return NULL;
@@
-241,10
+248,15
@@
make_relative_prefix_1 (const char *progname, const char *bin_prefix,
{
char *startp, *endp, *nstore;
size_t prefixlen = strlen (temp) + 1;
{
char *startp, *endp, *nstore;
size_t prefixlen = strlen (temp) + 1;
+ size_t len;
if (prefixlen < 2)
prefixlen = 2;
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)
startp = endp = temp;
while (1)
@@
-259,7
+271,7
@@
make_relative_prefix_1 (const char *progname, const char *bin_prefix,
}
else
{
}
else
{
-
strn
cpy (nstore, startp, endp - startp);
+
mem
cpy (nstore, startp, endp - startp);
if (! IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
if (! IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
@@
-275,8
+287,14
@@
make_relative_prefix_1 (const char *progname, const char *bin_prefix,
#endif
)
{
#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)
}
if (*endp == 0)
@@
-289,21
+307,22
@@
make_relative_prefix_1 (const char *progname, const char *bin_prefix,
}
}
}
}
- if ( resolve_links )
- {
- full_progname = lrealpath (progname);
- if (full_progname == NULL)
- return NULL;
- }
+ if (resolve_links)
+ full_progname = lrealpath (progname);
else
else
- full_progname = strdup(progname);
+ full_progname = strdup (progname);
+ if (full_progname == NULL)
+ return NULL;
prog_dirs = split_directories (full_progname, &prog_num);
prog_dirs = split_directories (full_progname, &prog_num);
- bin_dirs = split_directories (bin_prefix, &bin_num);
free (full_progname);
free (full_progname);
- if (
bin_dirs == NULL ||
prog_dirs == NULL)
+ if (prog_dirs == NULL)
return 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--;
/* Remove the program name from comparison of directory names. */
prog_num--;
@@
-320,21
+339,12
@@
make_relative_prefix_1 (const char *progname, const char *bin_prefix,
}
if (prog_num <= 0 || i == bin_num)
}
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)
}
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;
/* Find how many directories are in common between bin_prefix & prefix. */
n = (prefix_num < bin_num) ? prefix_num : bin_num;
@@
-346,12
+356,7
@@
make_relative_prefix_1 (const char *progname, const char *bin_prefix,
/* If there are no common directories, there can be no relative prefix. */
if (common == 0)
/* 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. */
/* Two passes: first figure out the size of the result string, and
then construct it. */
@@
-365,7
+370,7
@@
make_relative_prefix_1 (const char *progname, const char *bin_prefix,
ret = (char *) malloc (needed_len);
if (ret == NULL)
ret = (char *) malloc (needed_len);
if (ret == NULL)
-
return NULL
;
+
goto bailout
;
/* Build up the pathnames in argv[0]. */
*ret = '\0';
/* Build up the pathnames in argv[0]. */
*ret = '\0';
@@
-386,6
+391,7
@@
make_relative_prefix_1 (const char *progname, const char *bin_prefix,
for (i = common; i < prefix_num; i++)
strcat (ret, prefix_dirs[i]);
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);
free_split_directories (prog_dirs);
free_split_directories (bin_dirs);
free_split_directories (prefix_dirs);
This page took
0.026028 seconds
and
4
git commands to generate.