libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* path.cc: Include malloc.h for alloca. 

(is_symlink): Rewrite.  Just read the whole file in memory rather
	than by parts.  Account for an ITEMIDLIST if present, as well as
	the new style of Cygwin shortcut supporting targets > MAX_PATH.
This commit is contained in:
Brian Dessent 2008-03-16 17:04:02 +00:00
parent 615d9a0696
commit bff091bcfe
2 changed files with 53 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/utils/ChangeLog
View File

@ -1,3 +1,10 @@
2008-03-16 Brian Dessent <brian@dessent.net>
* path.cc: Include malloc.h for alloca.
(is_symlink): Rewrite. Just read the whole file in memory rather
than by parts. Account for an ITEMIDLIST if present, as well as
the new style of Cygwin shortcut supporting targets > MAX_PATH.
2008-03-12 Corinna Vinschen <corinna@vinschen.de> 2008-03-12 Corinna Vinschen <corinna@vinschen.de>
* cygpath.cc (do_sysfolders): Use cygwin_conv_path. * cygpath.cc (do_sysfolders): Use cygwin_conv_path.

84
winsup/utils/path.cc
View File

@ -18,6 +18,7 @@ details. */
#include <windows.h> #include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <malloc.h>
#include "path.h" #include "path.h"
#include "cygwin/include/cygwin/version.h" #include "cygwin/include/cygwin/version.h"
#include "cygwin/include/sys/mount.h" #include "cygwin/include/sys/mount.h"
@ -172,61 +173,58 @@ is_symlink (HANDLE fh)
bool bool
readlink (HANDLE fh, char *path, int maxlen) readlink (HANDLE fh, char *path, int maxlen)
{ {
int got; DWORD rv;
int magic = get_word (fh, 0x0); char *buf, *cp;
unsigned short len;
win_shortcut_hdr *file_header;
BY_HANDLE_FILE_INFORMATION fi;
if (magic == SHORTCUT_MAGIC) if (!GetFileInformationByHandle (fh, &fi)
{ || fi.nFileSizeHigh != 0
int offset = get_word (fh, 0x4c); || fi.nFileSizeLow > 8192)
int slen = get_word (fh, 0x4c + offset + 2);
if (slen >= maxlen)
{
SetLastError (ERROR_FILENAME_EXCED_RANGE);
return false;
}
if (SetFilePointer (fh, 0x4c + offset + 4, 0, FILE_BEGIN) ==
INVALID_SET_FILE_POINTER && GetLastError () != NO_ERROR)
return false; return false;
if (!ReadFile (fh, path, slen, (DWORD *) &got, 0)) buf = (char *) alloca (fi.nFileSizeLow + 1);
return false; file_header = (win_shortcut_hdr *) buf;
else if (got < slen)
{
SetLastError (ERROR_READ_FAULT);
return false;
}
else
path[got] = '\0';
}
else if (magic == SYMLINK_MAGIC)
{
char cookie_buf[sizeof (SYMLINK_COOKIE) - 1];
if (SetFilePointer (fh, 0, 0, FILE_BEGIN) == INVALID_SET_FILE_POINTER if (SetFilePointer (fh, 0L, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER
&& GetLastError () != NO_ERROR) || !ReadFile (fh, buf, fi.nFileSizeLow, &rv, NULL)
|| rv != fi.nFileSizeLow)
return false; return false;
if (!ReadFile (fh, cookie_buf, sizeof (cookie_buf), (DWORD *) &got, 0)) if (fi.nFileSizeLow > sizeof (file_header)
return false; && cmp_shortcut_header (file_header))
else if (got == sizeof (cookie_buf)
&& memcmp (cookie_buf, SYMLINK_COOKIE, sizeof (cookie_buf)) == 0)
{ {
if (!ReadFile (fh, path, maxlen, (DWORD *) &got, 0)) cp = buf + sizeof (win_shortcut_hdr);
if (file_header->flags & WSH_FLAG_IDLIST) /* Skip ITEMIDLIST */
cp += *(unsigned short *) cp + 2;
if (!(len = *(unsigned short *) cp))
return false; return false;
else if (got >= maxlen) cp += 2;
/* Has appended full path? If so, use it instead of description. */
unsigned short relpath_len = *(unsigned short *) (cp + len);
if (cp + len + 2 + relpath_len < buf + fi.nFileSizeLow)
{ {
SetLastError (ERROR_FILENAME_EXCED_RANGE); cp += len + 2 + relpath_len;
path[0] = '\0'; len = *(unsigned short *) cp;
return false; cp += 2;
} }
else if (len + 1 > maxlen)
path[got] = '\0';
}
}
else
return false; return false;
memcpy (path, cp, len);
path[len] = '\0';
return true; return true;
} }
else if (strncmp (buf, SYMLINK_COOKIE, strlen (SYMLINK_COOKIE)) == 0
&& fi.nFileSizeLow - strlen (SYMLINK_COOKIE) <= (unsigned) maxlen
&& buf[fi.nFileSizeLow - 1] == '\0')
{
strcpy (path, &buf[strlen (SYMLINK_COOKIE)]);
return true;
}
else
return false;
}
typedef struct mnt typedef struct mnt
{ {