mirrors/make
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/make.git synced 2025-01-31 03:25:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

On BSD, realpath(3) doesn't fail if the target doesn't exist, so test

Browse source 
explicitly with stat(2).  Fixes Savannah bug #35919.
This commit is contained in:
Paul Smith 2012-09-09 23:14:55 +00:00
parent 90ee335724
commit b9c4a38022
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2012-09-09 Paul Smith <psmith@gnu.org> 2012-09-09 Paul Smith <psmith@gnu.org>
* function.c (func_realpath): BSD realpath(3) doesn't fail if the
file does not exist: use stat. Fixes Savannah bug #35919.
* file.c (expand_deps): Duplicate the current variable buffer, not * file.c (expand_deps): Duplicate the current variable buffer, not
the old pointer. Fixes Savannah bug #36925. the old pointer. Fixes Savannah bug #36925.

6
function.c
View file

@ -2066,9 +2066,7 @@ func_realpath (char *o, char **argv, const char *funcname UNUSED)
const char *path = 0; const char *path = 0;
int doneany = 0; int doneany = 0;
unsigned int len = 0; unsigned int len = 0;
#ifndef HAVE_REALPATH
struct stat st; struct stat st;
#endif
PATH_VAR (in); PATH_VAR (in);
PATH_VAR (out); PATH_VAR (out);
@ -2083,9 +2081,9 @@ func_realpath (char *o, char **argv, const char *funcname UNUSED)
#ifdef HAVE_REALPATH #ifdef HAVE_REALPATH
realpath (in, out) realpath (in, out)
#else #else
abspath (in, out) && stat (out, &st) == 0 abspath (in, out)
#endif #endif
) && stat (out, &st) == 0)
{ {
o = variable_buffer_output (o, out, strlen (out)); o = variable_buffer_output (o, out, strlen (out));
o = variable_buffer_output (o, " ", 1); o = variable_buffer_output (o, " ", 1);