Skip to content

On Unix, avoid a conversion to wchar_t in getpath.c #153230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vstinner wants to merge 1 commit into
base: main
Choose a base branch
from
Open

On Unix, avoid a conversion to wchar_t in getpath.c #153230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 43 additions & 42 deletions Modules/getpath.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,57 +198,67 @@ getpath_isdir(PyObject *Py_UNUSED(self), PyObject *args)
static PyObject *
getpath_isfile(PyObject *Py_UNUSED(self), PyObject *args)
{
PyObject *r = NULL;
PyObject *pathobj;
const wchar_t *path;
if (!PyArg_ParseTuple(args, "U", &pathobj)) {
return NULL;
}
path = PyUnicode_AsWideCharString(pathobj, NULL);
if (path) {

int isfile;
#ifdef MS_WINDOWS
DWORD attr = GetFileAttributesW(path);
r = (attr != INVALID_FILE_ATTRIBUTES) &&
!(attr & FILE_ATTRIBUTE_DIRECTORY) ? Py_True : Py_False;
wchar_t *path = PyUnicode_AsWideCharString(pathobj, NULL);
if (path == NULL) {
return NULL;
}

DWORD attr = GetFileAttributesW(path);
PyMem_Free(path);
isfile = ((attr != INVALID_FILE_ATTRIBUTES)
&& !(attr & FILE_ATTRIBUTE_DIRECTORY));
#else
struct stat st;
r = (_Py_wstat(path, &st) == 0) && S_ISREG(st.st_mode) ? Py_True : Py_False;
#endif
PyMem_Free((void *)path);
struct stat st;
int res = _Py_stat(pathobj, &st);
if (res == -2) {
return NULL;
}
return Py_XNewRef(r);
isfile = ((res == 0) && S_ISREG(st.st_mode));
#endif
return PyBool_FromLong(isfile);
}


static PyObject *
getpath_isxfile(PyObject *Py_UNUSED(self), PyObject *args)
{
PyObject *r = NULL;
PyObject *pathobj;
const wchar_t *path;
Py_ssize_t cchPath;
if (!PyArg_ParseTuple(args, "U", &pathobj)) {
return NULL;
}
path = PyUnicode_AsWideCharString(pathobj, &cchPath);
if (path) {

int isxfile;
#ifdef MS_WINDOWS
DWORD attr = GetFileAttributesW(path);
r = (attr != INVALID_FILE_ATTRIBUTES) &&
!(attr & FILE_ATTRIBUTE_DIRECTORY) &&
(cchPath >= 4) &&
(CompareStringOrdinal(path + cchPath - 4, -1, L".exe", -1, 1 /* ignore case */) == CSTR_EQUAL)
? Py_True : Py_False;
Py_ssize_t cchPath;
wchar_t *path = PyUnicode_AsWideCharString(pathobj, &cchPath);
if (path == NULL) {
return NULL;
}

DWORD attr = GetFileAttributesW(path);
PyMem_Free(path);
isxfile = (attr != INVALID_FILE_ATTRIBUTES) &&
!(attr & FILE_ATTRIBUTE_DIRECTORY) &&
(cchPath >= 4) &&
(CompareStringOrdinal(path + cchPath - 4, -1, L".exe", -1, 1 /* ignore case */) == CSTR_EQUAL);
#else
struct stat st;
r = (_Py_wstat(path, &st) == 0) &&
S_ISREG(st.st_mode) &&
(st.st_mode & 0111)
? Py_True : Py_False;
#endif
PyMem_Free((void *)path);
struct stat st;
int res = _Py_stat(pathobj, &st);
if (res == -2) {
return NULL;
}
return Py_XNewRef(r);
isxfile = ((res == 0)
&& S_ISREG(st.st_mode)
&& (st.st_mode & 0111));
#endif
return PyBool_FromLong(isxfile);
}


Expand Down Expand Up @@ -340,25 +350,16 @@ getpath_joinpath(PyObject *Py_UNUSED(self), PyObject *args)
static PyObject *
getpath_readlines(PyObject *Py_UNUSED(self), PyObject *args)
{
PyObject *r = NULL;
PyObject *pathobj;
const wchar_t *path;
if (!PyArg_ParseTuple(args, "U", &pathobj)) {
return NULL;
}
path = PyUnicode_AsWideCharString(pathobj, NULL);
if (!path) {
return NULL;
}
FILE *fp = _Py_wfopen(path, L"rb");
FILE *fp = Py_fopen(pathobj, "rb");
if (!fp) {
PyErr_SetFromErrno(PyExc_OSError);
PyMem_Free((void *)path);
return NULL;
}
PyMem_Free((void *)path);

r = PyList_New(0);
PyObject *r = PyList_New(0);
if (!r) {
fclose(fp);
return NULL;
Expand Down
13 changes: 6 additions & 7 deletions Python/fileutils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1368,22 +1368,21 @@ _Py_stat(PyObject *path, struct stat *statbuf)
PyMem_Free(wpath);
return err;
#else
int ret;
PyObject *bytes;
char *cpath;

bytes = PyUnicode_EncodeFSDefault(path);
if (bytes == NULL)
PyObject *bytes = PyUnicode_EncodeFSDefault(path);
if (bytes == NULL) {
return -2;
}

/* check for embedded null bytes */
char *cpath;
if (PyBytes_AsStringAndSize(bytes, &cpath, NULL) == -1) {
Py_DECREF(bytes);
return -2;
}

ret = stat(cpath, statbuf);
int ret = stat(cpath, statbuf);
Py_DECREF(bytes);
assert(ret == 0 || ret == -1);
return ret;
#endif
}
Expand Down
Loading