languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-24 01:20:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Closes SF bug 113894: on Windows, things like os.listdir("k:") and

Browse source 
glob.glob("k:*py") (i.e., a raw drive letter + colon at the start) were
using the root of the drive rather than the expected Windows behavior
of using the drive's "current directory".
This commit is contained in:
Tim Peters 2000-09-15 07:44:49 +00:00
parent a2ebb87bfe
commit 0bb44a4a3a
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Modules/posixmodule.c
View file

@ -796,6 +796,7 @@ posix_listdir(PyObject *self, PyObject *args)
HANDLE hFindFile;
WIN32_FIND_DATA FileData;
char namebuf[MAX_PATH+5];
char ch;
if (!PyArg_ParseTuple(args, "t#:listdir", &name, &len))
return NULL;
@ -804,7 +805,8 @@ posix_listdir(PyObject *self, PyObject *args)
return NULL;
}
strcpy(namebuf, name);
if (namebuf[len-1] != '/' && namebuf[len-1] != '\\')
ch = namebuf[len-1];
if (ch != '/' && ch != '\\' && ch != ':')
namebuf[len++] = '/';
strcpy(namebuf + len, "*.*");
@ -844,8 +846,7 @@ posix_listdir(PyObject *self, PyObject *args)
return d;
#else /* !MS_WIN32 */
#ifdef _MSC_VER /* 16-bit Windows */
#elif defined(_MSC_VER) /* 16-bit Windows */
#ifndef MAX_PATH
#define MAX_PATH 250
@ -906,8 +907,7 @@ posix_listdir(PyObject *self, PyObject *args)
return d;
#else
#if defined(PYOS_OS2)
#elif defined(PYOS_OS2)
#ifndef MAX_PATH
#define MAX_PATH CCHMAXPATH
@ -1016,10 +1016,8 @@ posix_listdir(PyObject *self, PyObject *args)
return d;
#endif /* !PYOS_OS2 */
#endif /* !_MSC_VER */
#endif /* !MS_WIN32 */
}
#endif /* which OS */
} /* end of posix_listdir */
static char posix_mkdir__doc__[] =
"mkdir(path [, mode=0777]) -> None\n\