mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-21 10:24:55 +00:00
Code Issues Releases Activity

Revert 2013-01-25T10:27:16Z!eliz@gnu.org.

Browse Source
This commit is contained in:
Eli Zaretskii 2013-01-25 16:38:21 +02:00
parent ef3544f6a6
commit cda5fe8063
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ChangeLog
View File

@ -1,7 +1,5 @@
2013-01-25 Eli Zaretskii <eliz@gnu.org>
* w32.c (readlink): Support DBCS codepages.
* w32notify.c (Fw32notify_add_watch): Doc fix. (Bug#13540)
2013-01-25 Dmitry Antipov <dmantipov@yandex.ru>

24
src/w32.c
View File

@ -4639,34 +4639,18 @@ readlink (const char *name, char *buf, size_t buf_size)
else
{
size_t size_to_copy = buf_size;
BYTE *p = lname, *p2;
BYTE *p = lname;
BYTE *pend = p + lname_len;
int dbcs_p = max_filename_mbslen () > 1;
/* Normalize like dostounix_filename does, but we don't
want to assume that lname is null-terminated. */
if (dbcs_p)
p2 = CharNextExA (file_name_codepage, p, 0);
else
p2 = p + 1;
if (*p && *p2 == ':' && *p >= 'A' && *p <= 'Z')
{
*p += 'a' - 'A';
p += 2;
}
if (*p && p[1] == ':' && *p >= 'A' && *p <= 'Z')
*p += 'a' - 'A';
while (p <= pend)
{
if (*p == '\\')
*p = '/';
if (dbcs_p)
{
p = CharNextExA (file_name_codepage, p, 0);
/* CharNextExA doesn't advance at null character. */
if (!*p)
break;
}
else
++p;
++p;
}
/* Testing for null-terminated LNAME is paranoia:
WideCharToMultiByte should always return a