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 (readlink): Accommodate new UTF-16 symlinks.

This commit is contained in:
Corinna Vinschen 2009-04-07 16:24:50 +00:00
parent 21c7d001dc
commit 18ac7638b9
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/utils/ChangeLog
View File

@ -1,3 +1,7 @@
2009-04-07 Corinna Vinschen <corinna@vinschen.de>
* path.cc (readlink): Accommodate new UTF-16 symlinks.
2009-04-03 Kevin Buettner <kevinb@redhat.com> 2009-04-03 Kevin Buettner <kevinb@redhat.com>
* utils.sgml: Various syntactical and semantical fixes. * utils.sgml: Various syntactical and semantical fixes.

28
winsup/utils/path.cc
View File

@ -183,7 +183,7 @@ readlink (HANDLE fh, char *path, int maxlen)
if (!GetFileInformationByHandle (fh, &fi) if (!GetFileInformationByHandle (fh, &fi)
|| fi.nFileSizeHigh != 0 || fi.nFileSizeHigh != 0
|| fi.nFileSizeLow > 8192) || fi.nFileSizeLow > 4 * 65536)
return false; return false;
buf = (char *) alloca (fi.nFileSizeLow + 1); buf = (char *) alloca (fi.nFileSizeLow + 1);
@ -211,17 +211,35 @@ readlink (HANDLE fh, char *path, int maxlen)
len = *(unsigned short *) cp; len = *(unsigned short *) cp;
cp += 2; cp += 2;
} }
if (len + 1 > maxlen) if (*(PWCHAR) cp == 0xfeff) /* BOM */
{
len = wcstombs (NULL, (wchar_t *) (cp + 2), 0);
if (len == (size_t) -1 || len + 1 > maxlen)
return false;
wcstombs (path, (wchar_t *) (cp + 2), len + 1);
}
else if (len + 1 > maxlen)
return false; return false;
memcpy (path, cp, len); else
memcpy (path, cp, len);
path[len] = '\0'; path[len] = '\0';
return true; return true;
} }
else if (strncmp (buf, SYMLINK_COOKIE, strlen (SYMLINK_COOKIE)) == 0 else if (strncmp (buf, SYMLINK_COOKIE, strlen (SYMLINK_COOKIE)) == 0
&& fi.nFileSizeLow - strlen (SYMLINK_COOKIE) <= (unsigned) maxlen
&& buf[fi.nFileSizeLow - 1] == '\0') && buf[fi.nFileSizeLow - 1] == '\0')
{ {
strcpy (path, &buf[strlen (SYMLINK_COOKIE)]); cp = buf + strlen (SYMLINK_COOKIE);
if (*(PWCHAR) cp == 0xfeff) /* BOM */
{
len = wcstombs (NULL, (wchar_t *) (cp + 2), 0);
if (len == (size_t) -1 || len + 1 > maxlen)
return false;
wcstombs (path, (wchar_t *) (cp + 2), len + 1);
}
else if (fi.nFileSizeLow - strlen (SYMLINK_COOKIE) > (unsigned) maxlen)
return false;
else
strcpy (path, cp);
return true; return true;
} }
else else