mirrors/make-dfsg
1
0
Fork 0
mirror of https://salsa.debian.org/srivasta/make-dfsg.git synced 2024-10-23 12:49:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git.savannah.gnu.org:/srv/git/make

Browse source
This commit is contained in:
Paul Smith 2013-04-28 19:25:24 -04:00
commit 9253a34a57
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-04-28 Eli Zaretskii <eliz@gnu.org>
* dir.c (local_stat) [WINDOWS32]: Use the wrapper on MS-Windows.
If the argument ends in "dir/.", make sure the parent dir exists
and is indeed a directory. Fixes Savannah bug #37065.
2013-04-28 Paul Smith <psmith@gnu.org>
* makeint.h (message_s, error_s): Functions that print to strings

22
dir.c
View file

@ -1185,8 +1185,11 @@ ansi_free (void *p)
/* On 64 bit ReliantUNIX (5.44 and above) in LFS mode, stat() is actually a
* macro for stat64(). If stat is a macro, make a local wrapper function to
* invoke it.
*
* On MS-Windows, stat() "succeeds" for foo/bar/. where foo/bar is a
* regular file; fix that here.
*/
#ifndef stat
#if !defined(stat) && !defined(WINDOWS32)
# ifndef VMS
int stat (const char *path, struct stat *sbuf);
# endif
@ -1196,6 +1199,23 @@ static int
local_stat (const char *path, struct stat *buf)
{
int e;
#ifdef WINDOWS32
size_t plen = strlen (path);
/* Make sure the parent of "." exists and is a directory, not a
file. This is because 'stat' on Windows normalizes the argument
foo/. => foo without checking first that foo is a directory. */
if (plen > 1 && path[plen - 1] == '.'
&& (path[plen - 2] == '/' || path[plen - 2] == '\\'))
{
char parent[MAXPATHLEN];
strncpy (parent, path, plen - 2);
parent[plen - 2] = '\0';
if (stat (parent, buf) < 0 || !_S_ISDIR (buf->st_mode))
return -1;
}
#endif
EINTRLOOP (e, stat (path, buf));
return e;