JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* path.cc (symlink_worker): Write target filename as UTF-16 string

Browse Source 
with leading BOM marker.
	(symlink_info::check_shortcut): If check for leading BOM marker
	succeeds, read filename as UTF-16 string.
	(symlink_info::check_sysfile): Ditto.
This commit is contained in:
Corinna Vinschen 2009-03-26 12:12:11 +00:00
parent 62818522c2
commit 4d9c72800f
2 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2009-03-26 Corinna Vinschen <corinna@vinschen.de>
* path.cc (symlink_worker): Write target filename as UTF-16 string
with leading BOM marker.
(symlink_info::check_shortcut): If check for leading BOM marker
succeeds, read filename as UTF-16 string.
(symlink_info::check_sysfile): Ditto.
2009-03-26 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> 2009-03-26 Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
* include/asm/byteorder.h (__ntohl): Align definition to ISO C99. * include/asm/byteorder.h (__ntohl): Align definition to ISO C99.

44
winsup/cygwin/path.cc
View File

@ -1559,15 +1559,22 @@ symlink_worker (const char *oldpath, const char *newpath, bool use_winsym,
/* Append the POSIX path after the regular shortcut data for /* Append the POSIX path after the regular shortcut data for
the long path support. */ the long path support. */
*(unsigned short *)cp = oldpath_len; unsigned short *plen = (unsigned short *) cp;
cp = stpcpy (cp += 2, oldpath); cp += 2;
*(PWCHAR) cp = 0xfeff; /* BOM */
cp += 2;
*plen = sys_mbstowcs ((PWCHAR) cp, NT_MAX_PATH, oldpath) * sizeof (WCHAR);
cp += *plen;
} }
else else
{ {
/* This is the old technique creating a symlink. */ /* Default technique creating a symlink. */
buf = tp.c_get (); buf = (char *) tp.w_get ();
cp = stpcpy (buf, SYMLINK_COOKIE);
*(PWCHAR) cp = 0xfeff; /* BOM */
cp += 2;
/* Note that the terminating nul is written. */ /* Note that the terminating nul is written. */
cp = stpcpy (stpcpy (buf, SYMLINK_COOKIE), oldpath) + 1; cp += sys_mbstowcs ((PWCHAR) cp, NT_MAX_PATH, oldpath) * sizeof (WCHAR);
} }
if (isdevice && win32_newpath.exists ()) if (isdevice && win32_newpath.exists ())
@ -1714,11 +1721,22 @@ symlink_info::check_shortcut (HANDLE in_h)
len = *(unsigned short *) cp; len = *(unsigned short *) cp;
cp += 2; cp += 2;
} }
if (len > SYMLINK_MAX) if (*(PWCHAR) cp == 0xfeff) /* BOM */
{
char *tmpbuf = tp.c_get ();
if (sys_wcstombs (tmpbuf, NT_MAX_PATH, (PWCHAR) (cp + 2))
> SYMLINK_MAX + 1)
goto out; goto out;
res = posixify (tmpbuf);
}
else if (len > SYMLINK_MAX)
goto out;
else
{
cp[len] = '\0'; cp[len] = '\0';
res = posixify (cp); res = posixify (cp);
} }
}
if (res) /* It's a symlink. */ if (res) /* It's a symlink. */
pflags = PATH_SYMLINK | PATH_LNK; pflags = PATH_SYMLINK | PATH_LNK;
@ -1730,8 +1748,9 @@ out:
int int
symlink_info::check_sysfile (HANDLE in_h) symlink_info::check_sysfile (HANDLE in_h)
{ {
tmp_pathbuf tp;
char cookie_buf[sizeof (SYMLINK_COOKIE) - 1]; char cookie_buf[sizeof (SYMLINK_COOKIE) - 1];
char srcbuf[SYMLINK_MAX + 2]; char *srcbuf = tp.c_get ();
int res = 0; int res = 0;
UNICODE_STRING same = { 0, 0, (PWCHAR) L"" }; UNICODE_STRING same = { 0, 0, (PWCHAR) L"" };
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
@ -1761,13 +1780,22 @@ symlink_info::check_sysfile (HANDLE in_h)
pflags = PATH_SYMLINK; pflags = PATH_SYMLINK;
status = NtReadFile (h, NULL, NULL, NULL, &io, srcbuf, status = NtReadFile (h, NULL, NULL, NULL, &io, srcbuf,
SYMLINK_MAX + 2, NULL, NULL); NT_MAX_PATH, NULL, NULL);
if (!NT_SUCCESS (status)) if (!NT_SUCCESS (status))
{ {
debug_printf ("ReadFile2 failed"); debug_printf ("ReadFile2 failed");
if (status != STATUS_END_OF_FILE) if (status != STATUS_END_OF_FILE)
set_error (EIO); set_error (EIO);
} }
else if (*(PWCHAR) srcbuf == 0xfeff) /* BOM */
{
char *tmpbuf = tp.c_get ();
if (sys_wcstombs (tmpbuf, NT_MAX_PATH, (PWCHAR) (srcbuf + 2))
> SYMLINK_MAX + 1)
debug_printf ("symlink string too long");
else
res = posixify (tmpbuf);
}
else if (io.Information > SYMLINK_MAX + 1) else if (io.Information > SYMLINK_MAX + 1)
debug_printf ("symlink string too long"); debug_printf ("symlink string too long");
else else