summaryrefslogtreecommitdiffstats
path: root/Modules/posixmodule.c
diff options
context:
space:
mode:
authorTim Golden <mail@timgolden.me.uk>2013-10-25 19:24:06 (GMT)
committerTim Golden <mail@timgolden.me.uk>2013-10-25 19:24:06 (GMT)
commit781bbebacb9d26d216abaa8b66a7ce790f91dd98 (patch)
treeffb0381334bfca971d87d48b9d3af512372880b1 /Modules/posixmodule.c
parent502834cf3c6add73507b709b2f65d5118ec3a735 (diff)
downloadcpython-781bbebacb9d26d216abaa8b66a7ce790f91dd98.zip
cpython-781bbebacb9d26d216abaa8b66a7ce790f91dd98.tar.gz
cpython-781bbebacb9d26d216abaa8b66a7ce790f91dd98.tar.bz2
Issue13234 Allow listdir to handle extended paths on Windows (Patch by Santoso Wijaya)
Diffstat (limited to 'Modules/posixmodule.c')
-rw-r--r--Modules/posixmodule.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index b99b6a2..d5b5235 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -3608,8 +3608,8 @@ _listdir_windows_no_opendir(path_t *path, PyObject *list)
wcscpy(wnamebuf, po_wchars);
if (len > 0) {
wchar_t wch = wnamebuf[len-1];
- if (wch != L'/' && wch != L'\\' && wch != L':')
- wnamebuf[len++] = L'\\';
+ if (wch != SEP && wch != ALTSEP && wch != L':')
+ wnamebuf[len++] = SEP;
wcscpy(wnamebuf + len, L"*.*");
}
if ((list = PyList_New(0)) == NULL) {
@@ -3663,8 +3663,8 @@ _listdir_windows_no_opendir(path_t *path, PyObject *list)
len = path->length;
if (len > 0) {
char ch = namebuf[len-1];
- if (ch != SEP && ch != ALTSEP && ch != ':')
- namebuf[len++] = '/';
+ if (ch != '\\' && ch != '/' && ch != ':')
+ namebuf[len++] = '\\';
strcpy(namebuf + len, "*.*");
}