#undef KWTUPLE
PyObject *argsbuf[3];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
- path_t path = PATH_T_INITIALIZE("stat", "path", 0, 1);
+ path_t path = PATH_T_INITIALIZE_P("stat", "path", 0, 0, 0, 1);
int dir_fd = DEFAULT_DIR_FD;
int follow_symlinks = 1;
#undef KWTUPLE
PyObject *argsbuf[2];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
- path_t path = PATH_T_INITIALIZE("lstat", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("lstat", "path", 0, 0, 0, 0);
int dir_fd = DEFAULT_DIR_FD;
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
#undef KWTUPLE
PyObject *argsbuf[5];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 2;
- path_t path = PATH_T_INITIALIZE("access", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("access", "path", 0, 0, 0, 0);
int mode;
int dir_fd = DEFAULT_DIR_FD;
int effective_ids = 0;
};
#undef KWTUPLE
PyObject *argsbuf[1];
- path_t path = PATH_T_INITIALIZE("chdir", "path", 0, PATH_HAVE_FCHDIR);
+ path_t path = PATH_T_INITIALIZE_P("chdir", "path", 0, 0, 0, PATH_HAVE_FCHDIR);
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
if (!args) {
#undef KWTUPLE
PyObject *argsbuf[4];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 2;
- path_t path = PATH_T_INITIALIZE("chmod", "path", 0, PATH_HAVE_FCHMOD);
+ path_t path = PATH_T_INITIALIZE_P("chmod", "path", 0, 0, 0, PATH_HAVE_FCHMOD);
int mode;
int dir_fd = DEFAULT_DIR_FD;
int follow_symlinks = 1;
};
#undef KWTUPLE
PyObject *argsbuf[2];
- path_t path = PATH_T_INITIALIZE("lchmod", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("lchmod", "path", 0, 0, 0, 0);
int mode;
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 2, 2, 0, argsbuf);
#undef KWTUPLE
PyObject *argsbuf[3];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 2;
- path_t path = PATH_T_INITIALIZE("chflags", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("chflags", "path", 0, 0, 0, 0);
unsigned long flags;
int follow_symlinks = 1;
};
#undef KWTUPLE
PyObject *argsbuf[2];
- path_t path = PATH_T_INITIALIZE("lchflags", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("lchflags", "path", 0, 0, 0, 0);
unsigned long flags;
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 2, 2, 0, argsbuf);
};
#undef KWTUPLE
PyObject *argsbuf[1];
- path_t path = PATH_T_INITIALIZE("chroot", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("chroot", "path", 0, 0, 0, 0);
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
if (!args) {
#undef KWTUPLE
PyObject *argsbuf[5];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 3;
- path_t path = PATH_T_INITIALIZE("chown", "path", 0, PATH_HAVE_FCHOWN);
+ path_t path = PATH_T_INITIALIZE_P("chown", "path", 0, 0, 0, PATH_HAVE_FCHOWN);
uid_t uid;
gid_t gid;
int dir_fd = DEFAULT_DIR_FD;
};
#undef KWTUPLE
PyObject *argsbuf[3];
- path_t path = PATH_T_INITIALIZE("lchown", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("lchown", "path", 0, 0, 0, 0);
uid_t uid;
gid_t gid;
#undef KWTUPLE
PyObject *argsbuf[5];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 2;
- path_t src = PATH_T_INITIALIZE("link", "src", 0, 0);
- path_t dst = PATH_T_INITIALIZE("link", "dst", 0, 0);
+ path_t src = PATH_T_INITIALIZE_P("link", "src", 0, 0, 0, 0);
+ path_t dst = PATH_T_INITIALIZE_P("link", "dst", 0, 0, 0, 0);
int src_dir_fd = DEFAULT_DIR_FD;
int dst_dir_fd = DEFAULT_DIR_FD;
int follow_symlinks = 1;
#undef KWTUPLE
PyObject *argsbuf[1];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 0;
- path_t path = PATH_T_INITIALIZE("listdir", "path", 1, PATH_HAVE_FDOPENDIR);
+ path_t path = PATH_T_INITIALIZE_P("listdir", "path", 1, 0, 0, PATH_HAVE_FDOPENDIR);
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 0, 1, 0, argsbuf);
if (!args) {
};
#undef KWTUPLE
PyObject *argsbuf[1];
- path_t volume = PATH_T_INITIALIZE("listmounts", "volume", 0, 0);
+ path_t volume = PATH_T_INITIALIZE_P("listmounts", "volume", 0, 0, 0, 0);
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
if (!args) {
};
#undef KWTUPLE
PyObject *argsbuf[1];
- path_t path = PATH_T_INITIALIZE("_path_isdevdrive", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("_path_isdevdrive", "path", 0, 0, 0, 0);
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
if (!args) {
os__getfullpathname(PyObject *module, PyObject *arg)
{
PyObject *return_value = NULL;
- path_t path = PATH_T_INITIALIZE("_getfullpathname", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("_getfullpathname", "path", 0, 0, 0, 0);
if (!path_converter(arg, &path)) {
goto exit;
os__getfinalpathname(PyObject *module, PyObject *arg)
{
PyObject *return_value = NULL;
- path_t path = PATH_T_INITIALIZE("_getfinalpathname", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("_getfinalpathname", "path", 0, 0, 0, 0);
if (!path_converter(arg, &path)) {
goto exit;
};
#undef KWTUPLE
PyObject *argsbuf[1];
- path_t path = PATH_T_INITIALIZE("_getvolumepathname", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("_getvolumepathname", "path", 0, 0, 0, 0);
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
if (!args) {
};
#undef KWTUPLE
PyObject *argsbuf[1];
- path_t path = PATH_T_INITIALIZE("_path_splitroot", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("_path_splitroot", "path", 0, 0, 0, 0);
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
if (!args) {
{"_path_exists", (PyCFunction)os__path_exists, METH_O, os__path_exists__doc__},
static int
-os__path_exists_impl(PyObject *module, PyObject *path);
+os__path_exists_impl(PyObject *module, path_t *path);
static PyObject *
-os__path_exists(PyObject *module, PyObject *path)
+os__path_exists(PyObject *module, PyObject *arg)
{
PyObject *return_value = NULL;
+ path_t path = PATH_T_INITIALIZE_P("_path_exists", "path", 0, 0, 1, 1);
int _return_value;
- _return_value = os__path_exists_impl(module, path);
+ if (!path_converter(arg, &path)) {
+ goto exit;
+ }
+ _return_value = os__path_exists_impl(module, &path);
if ((_return_value == -1) && PyErr_Occurred()) {
goto exit;
}
return_value = PyBool_FromLong((long)_return_value);
exit:
+ /* Cleanup for path */
+ path_cleanup(&path);
+
return return_value;
}
{"_path_isdir", _PyCFunction_CAST(os__path_isdir), METH_FASTCALL|METH_KEYWORDS, os__path_isdir__doc__},
static int
-os__path_isdir_impl(PyObject *module, PyObject *path);
+os__path_isdir_impl(PyObject *module, path_t *path);
static PyObject *
os__path_isdir(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
};
#undef KWTUPLE
PyObject *argsbuf[1];
- PyObject *path;
+ path_t path = PATH_T_INITIALIZE_P("_path_isdir", "path", 0, 0, 1, 1);
int _return_value;
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
if (!args) {
goto exit;
}
- path = args[0];
- _return_value = os__path_isdir_impl(module, path);
+ if (!path_converter(args[0], &path)) {
+ goto exit;
+ }
+ _return_value = os__path_isdir_impl(module, &path);
if ((_return_value == -1) && PyErr_Occurred()) {
goto exit;
}
return_value = PyBool_FromLong((long)_return_value);
exit:
+ /* Cleanup for path */
+ path_cleanup(&path);
+
return return_value;
}
{"_path_isfile", _PyCFunction_CAST(os__path_isfile), METH_FASTCALL|METH_KEYWORDS, os__path_isfile__doc__},
static int
-os__path_isfile_impl(PyObject *module, PyObject *path);
+os__path_isfile_impl(PyObject *module, path_t *path);
static PyObject *
os__path_isfile(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
};
#undef KWTUPLE
PyObject *argsbuf[1];
- PyObject *path;
+ path_t path = PATH_T_INITIALIZE_P("_path_isfile", "path", 0, 0, 1, 1);
int _return_value;
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
if (!args) {
goto exit;
}
- path = args[0];
- _return_value = os__path_isfile_impl(module, path);
+ if (!path_converter(args[0], &path)) {
+ goto exit;
+ }
+ _return_value = os__path_isfile_impl(module, &path);
if ((_return_value == -1) && PyErr_Occurred()) {
goto exit;
}
return_value = PyBool_FromLong((long)_return_value);
exit:
+ /* Cleanup for path */
+ path_cleanup(&path);
+
return return_value;
}
{"_path_islink", _PyCFunction_CAST(os__path_islink), METH_FASTCALL|METH_KEYWORDS, os__path_islink__doc__},
static int
-os__path_islink_impl(PyObject *module, PyObject *path);
+os__path_islink_impl(PyObject *module, path_t *path);
static PyObject *
os__path_islink(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
};
#undef KWTUPLE
PyObject *argsbuf[1];
- PyObject *path;
+ path_t path = PATH_T_INITIALIZE_P("_path_islink", "path", 0, 0, 1, 1);
int _return_value;
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
if (!args) {
goto exit;
}
- path = args[0];
- _return_value = os__path_islink_impl(module, path);
+ if (!path_converter(args[0], &path)) {
+ goto exit;
+ }
+ _return_value = os__path_islink_impl(module, &path);
if ((_return_value == -1) && PyErr_Occurred()) {
goto exit;
}
return_value = PyBool_FromLong((long)_return_value);
exit:
+ /* Cleanup for path */
+ path_cleanup(&path);
+
return return_value;
}
"_path_normpath($module, /, path)\n"
"--\n"
"\n"
-"Basic path normalization.");
+"Normalize path, eliminating double slashes, etc.");
#define OS__PATH_NORMPATH_METHODDEF \
{"_path_normpath", _PyCFunction_CAST(os__path_normpath), METH_FASTCALL|METH_KEYWORDS, os__path_normpath__doc__},
static PyObject *
-os__path_normpath_impl(PyObject *module, PyObject *path);
+os__path_normpath_impl(PyObject *module, path_t *path);
static PyObject *
os__path_normpath(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
};
#undef KWTUPLE
PyObject *argsbuf[1];
- PyObject *path;
+ path_t path = PATH_T_INITIALIZE("_path_normpath", "path", 0, 1, 1, 0, 0);
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
if (!args) {
goto exit;
}
- path = args[0];
- return_value = os__path_normpath_impl(module, path);
+ if (!path_converter(args[0], &path)) {
+ goto exit;
+ }
+ return_value = os__path_normpath_impl(module, &path);
exit:
+ /* Cleanup for path */
+ path_cleanup(&path);
+
return return_value;
}
#undef KWTUPLE
PyObject *argsbuf[3];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
- path_t path = PATH_T_INITIALIZE("mkdir", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("mkdir", "path", 0, 0, 0, 0);
int mode = 511;
int dir_fd = DEFAULT_DIR_FD;
#undef KWTUPLE
PyObject *argsbuf[4];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 2;
- path_t src = PATH_T_INITIALIZE("rename", "src", 0, 0);
- path_t dst = PATH_T_INITIALIZE("rename", "dst", 0, 0);
+ path_t src = PATH_T_INITIALIZE_P("rename", "src", 0, 0, 0, 0);
+ path_t dst = PATH_T_INITIALIZE_P("rename", "dst", 0, 0, 0, 0);
int src_dir_fd = DEFAULT_DIR_FD;
int dst_dir_fd = DEFAULT_DIR_FD;
#undef KWTUPLE
PyObject *argsbuf[4];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 2;
- path_t src = PATH_T_INITIALIZE("replace", "src", 0, 0);
- path_t dst = PATH_T_INITIALIZE("replace", "dst", 0, 0);
+ path_t src = PATH_T_INITIALIZE_P("replace", "src", 0, 0, 0, 0);
+ path_t dst = PATH_T_INITIALIZE_P("replace", "dst", 0, 0, 0, 0);
int src_dir_fd = DEFAULT_DIR_FD;
int dst_dir_fd = DEFAULT_DIR_FD;
#undef KWTUPLE
PyObject *argsbuf[2];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
- path_t path = PATH_T_INITIALIZE("rmdir", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("rmdir", "path", 0, 0, 0, 0);
int dir_fd = DEFAULT_DIR_FD;
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
#undef KWTUPLE
PyObject *argsbuf[2];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
- path_t path = PATH_T_INITIALIZE("unlink", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("unlink", "path", 0, 0, 0, 0);
int dir_fd = DEFAULT_DIR_FD;
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
#undef KWTUPLE
PyObject *argsbuf[2];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
- path_t path = PATH_T_INITIALIZE("remove", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("remove", "path", 0, 0, 0, 0);
int dir_fd = DEFAULT_DIR_FD;
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
#undef KWTUPLE
PyObject *argsbuf[5];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
- path_t path = PATH_T_INITIALIZE("utime", "path", 0, PATH_UTIME_HAVE_FD);
+ path_t path = PATH_T_INITIALIZE_P("utime", "path", 0, 0, 0, PATH_UTIME_HAVE_FD);
PyObject *times = Py_None;
PyObject *ns = NULL;
int dir_fd = DEFAULT_DIR_FD;
os_execv(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
- path_t path = PATH_T_INITIALIZE("execv", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("execv", "path", 0, 0, 0, 0);
PyObject *argv;
if (!_PyArg_CheckPositional("execv", nargs, 2, 2)) {
};
#undef KWTUPLE
PyObject *argsbuf[3];
- path_t path = PATH_T_INITIALIZE("execve", "path", 0, PATH_HAVE_FEXECVE);
+ path_t path = PATH_T_INITIALIZE_P("execve", "path", 0, 0, 0, PATH_HAVE_FEXECVE);
PyObject *argv;
PyObject *env;
#undef KWTUPLE
PyObject *argsbuf[10];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 3;
- path_t path = PATH_T_INITIALIZE("posix_spawn", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("posix_spawn", "path", 0, 0, 0, 0);
PyObject *argv;
PyObject *env;
PyObject *file_actions = NULL;
#undef KWTUPLE
PyObject *argsbuf[10];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 3;
- path_t path = PATH_T_INITIALIZE("posix_spawnp", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("posix_spawnp", "path", 0, 0, 0, 0);
PyObject *argv;
PyObject *env;
PyObject *file_actions = NULL;
{
PyObject *return_value = NULL;
int mode;
- path_t path = PATH_T_INITIALIZE("spawnv", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("spawnv", "path", 0, 0, 0, 0);
PyObject *argv;
if (!_PyArg_CheckPositional("spawnv", nargs, 3, 3)) {
{
PyObject *return_value = NULL;
int mode;
- path_t path = PATH_T_INITIALIZE("spawnve", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("spawnve", "path", 0, 0, 0, 0);
PyObject *argv;
PyObject *env;
#undef KWTUPLE
PyObject *argsbuf[2];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
- path_t path = PATH_T_INITIALIZE("readlink", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("readlink", "path", 0, 0, 0, 0);
int dir_fd = DEFAULT_DIR_FD;
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
#undef KWTUPLE
PyObject *argsbuf[4];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 2;
- path_t src = PATH_T_INITIALIZE("symlink", "src", 0, 0);
- path_t dst = PATH_T_INITIALIZE("symlink", "dst", 0, 0);
+ path_t src = PATH_T_INITIALIZE_P("symlink", "src", 0, 0, 0, 0);
+ path_t dst = PATH_T_INITIALIZE_P("symlink", "dst", 0, 0, 0, 0);
int target_is_directory = 0;
int dir_fd = DEFAULT_DIR_FD;
#undef KWTUPLE
PyObject *argsbuf[4];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 2;
- path_t path = PATH_T_INITIALIZE("open", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("open", "path", 0, 0, 0, 0);
int flags;
int mode = 511;
int dir_fd = DEFAULT_DIR_FD;
#undef KWTUPLE
PyObject *argsbuf[3];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
- path_t path = PATH_T_INITIALIZE("mkfifo", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("mkfifo", "path", 0, 0, 0, 0);
int mode = 438;
int dir_fd = DEFAULT_DIR_FD;
#undef KWTUPLE
PyObject *argsbuf[4];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
- path_t path = PATH_T_INITIALIZE("mknod", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("mknod", "path", 0, 0, 0, 0);
int mode = 384;
dev_t device = 0;
int dir_fd = DEFAULT_DIR_FD;
};
#undef KWTUPLE
PyObject *argsbuf[2];
- path_t path = PATH_T_INITIALIZE("truncate", "path", 0, PATH_HAVE_FTRUNCATE);
+ path_t path = PATH_T_INITIALIZE_P("truncate", "path", 0, 0, 0, PATH_HAVE_FTRUNCATE);
Py_off_t length;
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 2, 2, 0, argsbuf);
};
#undef KWTUPLE
PyObject *argsbuf[1];
- path_t path = PATH_T_INITIALIZE("statvfs", "path", 0, PATH_HAVE_FSTATVFS);
+ path_t path = PATH_T_INITIALIZE_P("statvfs", "path", 0, 0, 0, PATH_HAVE_FSTATVFS);
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
if (!args) {
};
#undef KWTUPLE
PyObject *argsbuf[1];
- path_t path = PATH_T_INITIALIZE("_getdiskusage", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("_getdiskusage", "path", 0, 0, 0, 0);
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
if (!args) {
};
#undef KWTUPLE
PyObject *argsbuf[2];
- path_t path = PATH_T_INITIALIZE("pathconf", "path", 0, PATH_HAVE_FPATHCONF);
+ path_t path = PATH_T_INITIALIZE_P("pathconf", "path", 0, 0, 0, PATH_HAVE_FPATHCONF);
int name;
long _return_value;
#undef KWTUPLE
PyObject *argsbuf[5];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
- path_t filepath = PATH_T_INITIALIZE("startfile", "filepath", 0, 0);
+ path_t filepath = PATH_T_INITIALIZE_P("startfile", "filepath", 0, 0, 0, 0);
const Py_UNICODE *operation = NULL;
const Py_UNICODE *arguments = NULL;
- path_t cwd = PATH_T_INITIALIZE("startfile", "cwd", 1, 0);
+ path_t cwd = PATH_T_INITIALIZE_P("startfile", "cwd", 1, 0, 0, 0);
int show_cmd = 1;
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 5, 0, argsbuf);
#undef KWTUPLE
PyObject *argsbuf[3];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 2;
- path_t path = PATH_T_INITIALIZE("getxattr", "path", 0, 1);
- path_t attribute = PATH_T_INITIALIZE("getxattr", "attribute", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("getxattr", "path", 0, 0, 0, 1);
+ path_t attribute = PATH_T_INITIALIZE_P("getxattr", "attribute", 0, 0, 0, 0);
int follow_symlinks = 1;
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 2, 2, 0, argsbuf);
#undef KWTUPLE
PyObject *argsbuf[5];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 3;
- path_t path = PATH_T_INITIALIZE("setxattr", "path", 0, 1);
- path_t attribute = PATH_T_INITIALIZE("setxattr", "attribute", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("setxattr", "path", 0, 0, 0, 1);
+ path_t attribute = PATH_T_INITIALIZE_P("setxattr", "attribute", 0, 0, 0, 0);
Py_buffer value = {NULL, NULL};
int flags = 0;
int follow_symlinks = 1;
#undef KWTUPLE
PyObject *argsbuf[3];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 2;
- path_t path = PATH_T_INITIALIZE("removexattr", "path", 0, 1);
- path_t attribute = PATH_T_INITIALIZE("removexattr", "attribute", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("removexattr", "path", 0, 0, 0, 1);
+ path_t attribute = PATH_T_INITIALIZE_P("removexattr", "attribute", 0, 0, 0, 0);
int follow_symlinks = 1;
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 2, 2, 0, argsbuf);
#undef KWTUPLE
PyObject *argsbuf[2];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 0;
- path_t path = PATH_T_INITIALIZE("listxattr", "path", 1, 1);
+ path_t path = PATH_T_INITIALIZE_P("listxattr", "path", 1, 0, 0, 1);
int follow_symlinks = 1;
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 0, 1, 0, argsbuf);
#undef KWTUPLE
PyObject *argsbuf[1];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 0;
- path_t path = PATH_T_INITIALIZE("scandir", "path", 1, PATH_HAVE_FDOPENDIR);
+ path_t path = PATH_T_INITIALIZE_P("scandir", "path", 1, 0, 0, PATH_HAVE_FDOPENDIR);
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 0, 1, 0, argsbuf);
if (!args) {
};
#undef KWTUPLE
PyObject *argsbuf[1];
- path_t path = PATH_T_INITIALIZE("_add_dll_directory", "path", 0, 0);
+ path_t path = PATH_T_INITIALIZE_P("_add_dll_directory", "path", 0, 0, 0, 0);
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
if (!args) {
#ifndef OS_WAITSTATUS_TO_EXITCODE_METHODDEF
#define OS_WAITSTATUS_TO_EXITCODE_METHODDEF
#endif /* !defined(OS_WAITSTATUS_TO_EXITCODE_METHODDEF) */
-/*[clinic end generated code: output=46e87bace3cc07b6 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=485aa0aed01eb699 input=a9049054013a1b77]*/
*
* path_converter accepts (Unicode) strings and their
* subclasses, and bytes and their subclasses. What
- * it does with the argument depends on the platform:
+ * it does with the argument depends on path.make_wide:
*
- * * On Windows, if we get a (Unicode) string we
- * extract the wchar_t * and return it; if we get
- * bytes we decode to wchar_t * and return that.
+ * * If path.make_wide is nonzero, if we get a (Unicode)
+ * string we extract the wchar_t * and return it; if we
+ * get bytes we decode to wchar_t * and return that.
*
- * * On all other platforms, strings are encoded
- * to bytes using PyUnicode_FSConverter, then we
- * extract the char * from the bytes object and
- * return that.
+ * * If path.make_wide is zero, if we get bytes we extract
+ * the char_t * and return it; if we get a (Unicode)
+ * string we encode to char_t * and return that.
*
* path_converter also optionally accepts signed
* integers (representing open file descriptors) instead
* Input fields:
* path.nullable
* If nonzero, the path is permitted to be None.
+ * path.nonstrict
+ * If nonzero, the path is permitted to contain
+ * embedded null characters and have any length.
+ * path.make_wide
+ * If nonzero, the converter always uses wide, decoding if necessary, else
+ * it always uses narrow, encoding if necessary. The default value is
+ * nonzero on Windows, else zero.
+ * path.suppress_value_error
+ * If nonzero, raising ValueError is suppressed.
* path.allow_fd
* If nonzero, the path is permitted to be a file handle
* (a signed int) instead of a string.
* Output fields:
* path.wide
* Points to the path if it was expressed as Unicode
- * and was not encoded. (Only used on Windows.)
+ * or if it was bytes and decoded to Unicode.
* path.narrow
* Points to the path if it was expressed as bytes,
- * or it was Unicode and was encoded to bytes. (On Windows,
- * is a non-zero integer if the path was expressed as bytes.
- * The type is deliberately incompatible to prevent misuse.)
+ * or if it was Unicode and encoded to bytes.
* path.fd
* Contains a file descriptor if path.accept_fd was true
* and the caller provided a signed integer instead of any
* unspecified, path_converter will never get called.
* So if you set allow_fd, you *MUST* initialize path.fd = -1
* yourself!
+ * path.value_error
+ * If nonzero, then suppress_value_error was specified and a ValueError
+ * occurred.
* path.length
* The length of the path in characters, if specified as
* a string.
* path_cleanup(). However it is safe to do so.)
*/
typedef struct {
+ // Input fields
const char *function_name;
const char *argument_name;
int nullable;
+ int nonstrict;
+ int make_wide;
+ int suppress_value_error;
int allow_fd;
+ // Output fields
const wchar_t *wide;
-#ifdef MS_WINDOWS
- BOOL narrow;
-#else
const char *narrow;
-#endif
int fd;
+ int value_error;
Py_ssize_t length;
PyObject *object;
PyObject *cleanup;
} path_t;
+#define PATH_T_INITIALIZE(function_name, argument_name, nullable, nonstrict, \
+ make_wide, suppress_value_error, allow_fd) \
+ {function_name, argument_name, nullable, nonstrict, make_wide, \
+ suppress_value_error, allow_fd, NULL, NULL, -1, 0, 0, NULL, NULL}
#ifdef MS_WINDOWS
-#define PATH_T_INITIALIZE(function_name, argument_name, nullable, allow_fd) \
- {function_name, argument_name, nullable, allow_fd, NULL, FALSE, -1, 0, NULL, NULL}
+#define PATH_T_INITIALIZE_P(function_name, argument_name, nullable, \
+ nonstrict, suppress_value_error, allow_fd) \
+ PATH_T_INITIALIZE(function_name, argument_name, nullable, nonstrict, 1, \
+ suppress_value_error, allow_fd)
#else
-#define PATH_T_INITIALIZE(function_name, argument_name, nullable, allow_fd) \
- {function_name, argument_name, nullable, allow_fd, NULL, NULL, -1, 0, NULL, NULL}
+#define PATH_T_INITIALIZE_P(function_name, argument_name, nullable, \
+ nonstrict, suppress_value_error, allow_fd) \
+ PATH_T_INITIALIZE(function_name, argument_name, nullable, nonstrict, 0, \
+ suppress_value_error, allow_fd)
#endif
static void
Py_ssize_t length = 0;
int is_index, is_bytes, is_unicode;
const char *narrow;
-#ifdef MS_WINDOWS
PyObject *wo = NULL;
wchar_t *wide = NULL;
-#endif
#define FORMAT_EXCEPTION(exc, fmt) \
PyErr_Format(exc, "%s%s" fmt, \
if ((o == Py_None) && path->nullable) {
path->wide = NULL;
-#ifdef MS_WINDOWS
- path->narrow = FALSE;
-#else
path->narrow = NULL;
-#endif
path->fd = -1;
goto success_exit;
}
}
if (is_unicode) {
+ if (path->make_wide) {
+ wide = PyUnicode_AsWideCharString(o, &length);
+ if (!wide) {
+ goto error_exit;
+ }
#ifdef MS_WINDOWS
- wide = PyUnicode_AsWideCharString(o, &length);
- if (!wide) {
- goto error_exit;
- }
- if (length > 32767) {
- FORMAT_EXCEPTION(PyExc_ValueError, "%s too long for Windows");
- goto error_exit;
- }
- if (wcslen(wide) != length) {
- FORMAT_EXCEPTION(PyExc_ValueError, "embedded null character in %s");
- goto error_exit;
- }
+ if (!path->nonstrict && length > 32767) {
+ FORMAT_EXCEPTION(PyExc_ValueError, "%s too long for Windows");
+ goto error_exit;
+ }
+#endif
+ if (!path->nonstrict && wcslen(wide) != (size_t)length) {
+ FORMAT_EXCEPTION(PyExc_ValueError,
+ "embedded null character in %s");
+ goto error_exit;
+ }
- path->wide = wide;
- path->narrow = FALSE;
- path->fd = -1;
- wide = NULL;
- goto success_exit;
-#else
- if (!PyUnicode_FSConverter(o, &bytes)) {
+ path->wide = wide;
+ path->narrow = NULL;
+ path->fd = -1;
+ wide = NULL;
+ goto success_exit;
+ }
+ bytes = PyUnicode_EncodeFSDefault(o);
+ if (!bytes) {
goto error_exit;
}
-#endif
}
else if (is_bytes) {
bytes = Py_NewRef(o);
goto error_exit;
}
path->wide = NULL;
-#ifdef MS_WINDOWS
- path->narrow = FALSE;
-#else
path->narrow = NULL;
-#endif
goto success_exit;
}
else {
length = PyBytes_GET_SIZE(bytes);
narrow = PyBytes_AS_STRING(bytes);
- if ((size_t)length != strlen(narrow)) {
+ if (!path->nonstrict && strlen(narrow) != (size_t)length) {
FORMAT_EXCEPTION(PyExc_ValueError, "embedded null character in %s");
goto error_exit;
}
-#ifdef MS_WINDOWS
- wo = PyUnicode_DecodeFSDefaultAndSize(
- narrow,
- length
- );
- if (!wo) {
- goto error_exit;
- }
+ if (path->make_wide) {
+ wo = PyUnicode_DecodeFSDefaultAndSize(narrow, length);
+ if (!wo) {
+ goto error_exit;
+ }
- wide = PyUnicode_AsWideCharString(wo, &length);
- Py_DECREF(wo);
- if (!wide) {
- goto error_exit;
- }
- if (length > 32767) {
- FORMAT_EXCEPTION(PyExc_ValueError, "%s too long for Windows");
- goto error_exit;
- }
- if (wcslen(wide) != length) {
- FORMAT_EXCEPTION(PyExc_ValueError, "embedded null character in %s");
- goto error_exit;
- }
- path->wide = wide;
- path->narrow = TRUE;
- Py_DECREF(bytes);
- wide = NULL;
-#else
- path->wide = NULL;
- path->narrow = narrow;
- if (bytes == o) {
- /* Still a reference owned by path->object, don't have to
- worry about path->narrow is used after free. */
+ wide = PyUnicode_AsWideCharString(wo, &length);
+ Py_DECREF(wo);
+ if (!wide) {
+ goto error_exit;
+ }
+#ifdef MS_WINDOWS
+ if (!path->nonstrict && length > 32767) {
+ FORMAT_EXCEPTION(PyExc_ValueError, "%s too long for Windows");
+ goto error_exit;
+ }
+#endif
+ if (!path->nonstrict && wcslen(wide) != (size_t)length) {
+ FORMAT_EXCEPTION(PyExc_ValueError,
+ "embedded null character in %s");
+ goto error_exit;
+ }
+ path->wide = wide;
+ path->narrow = NULL;
Py_DECREF(bytes);
+ wide = NULL;
}
else {
- path->cleanup = bytes;
+ path->wide = NULL;
+ path->narrow = narrow;
+ if (bytes == o) {
+ /* Still a reference owned by path->object, don't have to
+ worry about path->narrow is used after free. */
+ Py_DECREF(bytes);
+ }
+ else {
+ path->cleanup = bytes;
+ }
}
-#endif
path->fd = -1;
success_exit:
+ path->value_error = 0;
path->length = length;
path->object = o;
return Py_CLEANUP_SUPPORTED;
error_exit:
Py_XDECREF(o);
Py_XDECREF(bytes);
-#ifdef MS_WINDOWS
PyMem_Free(wide);
-#endif
- return 0;
+ if (!path->suppress_value_error ||
+ !PyErr_ExceptionMatches(PyExc_ValueError))
+ {
+ return 0;
+ }
+ PyErr_Clear();
+ path->wide = NULL;
+ path->narrow = NULL;
+ path->fd = -1;
+ path->value_error = 1;
+ path->length = 0;
+ path->object = NULL;
+ return Py_CLEANUP_SUPPORTED;
}
static void
static int
path_and_dir_fd_invalid(const char *function_name, path_t *path, int dir_fd)
{
- if (!path->wide && (dir_fd != DEFAULT_DIR_FD)
-#ifndef MS_WINDOWS
- && !path->narrow
-#endif
- ) {
+ if (!path->wide && (dir_fd != DEFAULT_DIR_FD) && !path->narrow) {
PyErr_Format(PyExc_ValueError,
"%s: can't specify dir_fd without matching path",
function_name);
converter = 'path_converter'
- def converter_init(self, *, allow_fd=False, nullable=False):
+ def converter_init(self, *, allow_fd=False, make_wide=None,
+ nonstrict=False, nullable=False,
+ suppress_value_error=False):
# right now path_t doesn't support default values.
# to support a default value, you'll need to override initialize().
if self.default not in (unspecified, None):
raise RuntimeError("Can't specify a c_default to the path_t converter!")
self.nullable = nullable
+ self.nonstrict = nonstrict
+ self.make_wide = make_wide
+ self.suppress_value_error = suppress_value_error
self.allow_fd = allow_fd
def pre_render(self):
return str(int(bool(value)))
# add self.py_name here when merging with posixmodule conversion
- self.c_default = 'PATH_T_INITIALIZE("{}", "{}", {}, {})'.format(
- self.function.name,
- self.name,
- strify(self.nullable),
- strify(self.allow_fd),
+ if self.make_wide is None:
+ self.c_default = 'PATH_T_INITIALIZE_P("{}", "{}", {}, {}, {}, {})'.format(
+ self.function.name,
+ self.name,
+ strify(self.nullable),
+ strify(self.nonstrict),
+ strify(self.suppress_value_error),
+ strify(self.allow_fd),
+ )
+ else:
+ self.c_default = 'PATH_T_INITIALIZE("{}", "{}", {}, {}, {}, {}, {})'.format(
+ self.function.name,
+ self.name,
+ strify(self.nullable),
+ strify(self.nonstrict),
+ strify(self.make_wide),
+ strify(self.suppress_value_error),
+ strify(self.allow_fd),
)
def cleanup(self):
converter="conv_sysconf_confname"
[python start generated code]*/
-/*[python end generated code: output=da39a3ee5e6b4b0d input=3338733161aa7879]*/
+/*[python end generated code: output=da39a3ee5e6b4b0d input=577cb476e5d64960]*/
/*[clinic input]
{
PyObject *v;
HANDLE hFindFile = INVALID_HANDLE_VALUE;
- BOOL result;
+ BOOL result, return_bytes;
wchar_t namebuf[MAX_PATH+4]; /* Overallocate for "\*.*" */
/* only claim to have space for MAX_PATH */
Py_ssize_t len = Py_ARRAY_LENGTH(namebuf)-4;
if (!path->wide) { /* Default arg: "." */
po_wchars = L".";
len = 1;
+ return_bytes = 0;
} else {
po_wchars = path->wide;
len = wcslen(path->wide);
+ return_bytes = PyBytes_Check(path->object);
}
/* The +5 is so we can append "\\*.*\0" */
wnamebuf = PyMem_New(wchar_t, len + 5);
wcscmp(wFileData.cFileName, L"..") != 0) {
v = PyUnicode_FromWideChar(wFileData.cFileName,
wcslen(wFileData.cFileName));
- if (path->narrow && v) {
+ if (return_bytes && v) {
Py_SETREF(v, PyUnicode_EncodeFSDefault(v));
}
if (v == NULL) {
if (str == NULL) {
return NULL;
}
- if (path->narrow) {
+ if (PyBytes_Check(path->object)) {
Py_SETREF(str, PyUnicode_EncodeFSDefault(str));
}
return str;
}
result = PyUnicode_FromWideChar(target_path, result_length);
- if (result && path->narrow) {
+ if (result && PyBytes_Check(path->object)) {
Py_SETREF(result, PyUnicode_EncodeFSDefault(result));
}
goto exit;
}
result = PyUnicode_FromWideChar(mountpath, wcslen(mountpath));
- if (path->narrow)
+ if (PyBytes_Check(path->object))
Py_SETREF(result, PyUnicode_EncodeFSDefault(result));
exit:
}
-static int
-_testFileExists(path_t *_path, PyObject *path, BOOL followLinks)
+static BOOL
+_testFileExists(path_t *path, BOOL followLinks)
{
BOOL result = FALSE;
- if (!path_converter(path, _path)) {
- path_cleanup(_path);
- if (PyErr_ExceptionMatches(PyExc_ValueError)) {
- PyErr_Clear();
- return FALSE;
- }
- return -1;
+ if (path->value_error) {
+ return FALSE;
}
Py_BEGIN_ALLOW_THREADS
- if (_path->fd != -1) {
- HANDLE hfile = _Py_get_osfhandle_noraise(_path->fd);
+ if (path->fd != -1) {
+ HANDLE hfile = _Py_get_osfhandle_noraise(path->fd);
if (hfile != INVALID_HANDLE_VALUE) {
if (GetFileType(hfile) != FILE_TYPE_UNKNOWN || !GetLastError()) {
result = TRUE;
}
}
}
- else if (_path->wide) {
- result = _testFileExistsByName(_path->wide, followLinks);
+ else if (path->wide) {
+ result = _testFileExistsByName(path->wide, followLinks);
}
Py_END_ALLOW_THREADS
- path_cleanup(_path);
return result;
}
-static int
-_testFileType(path_t *_path, PyObject *path, int testedType)
+static BOOL
+_testFileType(path_t *path, int testedType)
{
BOOL result = FALSE;
- if (!path_converter(path, _path)) {
- path_cleanup(_path);
- if (PyErr_ExceptionMatches(PyExc_ValueError)) {
- PyErr_Clear();
- return FALSE;
- }
- return -1;
+ if (path->value_error) {
+ return FALSE;
}
Py_BEGIN_ALLOW_THREADS
- if (_path->fd != -1) {
- HANDLE hfile = _Py_get_osfhandle_noraise(_path->fd);
+ if (path->fd != -1) {
+ HANDLE hfile = _Py_get_osfhandle_noraise(path->fd);
if (hfile != INVALID_HANDLE_VALUE) {
result = _testFileTypeByHandle(hfile, testedType, TRUE);
}
}
- else if (_path->wide) {
- result = _testFileTypeByName(_path->wide, testedType);
+ else if (path->wide) {
+ result = _testFileTypeByName(path->wide, testedType);
}
Py_END_ALLOW_THREADS
- path_cleanup(_path);
return result;
}
/*[clinic input]
os._path_exists -> bool
- path: object
+ path: path_t(allow_fd=True, suppress_value_error=True)
/
Test whether a path exists. Returns False for broken symbolic links.
[clinic start generated code]*/
static int
-os__path_exists_impl(PyObject *module, PyObject *path)
-/*[clinic end generated code: output=8f784b3abf9f8588 input=2777da15bc4ba5a3]*/
+os__path_exists_impl(PyObject *module, path_t *path)
+/*[clinic end generated code: output=8da13acf666e16ba input=29198507a6082a57]*/
{
- path_t _path = PATH_T_INITIALIZE("_path_exists", "path", 0, 1);
- return _testFileExists(&_path, path, TRUE);
+ return _testFileExists(path, TRUE);
}
/*[clinic input]
os._path_isdir -> bool
- s as path: object
+ s as path: path_t(allow_fd=True, suppress_value_error=True)
Return true if the pathname refers to an existing directory.
[clinic start generated code]*/
static int
-os__path_isdir_impl(PyObject *module, PyObject *path)
-/*[clinic end generated code: output=0504fd403f369701 input=2cb54dd97eb970f7]*/
+os__path_isdir_impl(PyObject *module, path_t *path)
+/*[clinic end generated code: output=d5786196f9e2fa7a input=132a3b5301aecf79]*/
{
- path_t _path = PATH_T_INITIALIZE("_path_isdir", "s", 0, 1);
- return _testFileType(&_path, path, PY_IFDIR);
+ return _testFileType(path, PY_IFDIR);
}
/*[clinic input]
os._path_isfile -> bool
- path: object
+ path: path_t(allow_fd=True, suppress_value_error=True)
Test whether a path is a regular file
[clinic start generated code]*/
static int
-os__path_isfile_impl(PyObject *module, PyObject *path)
-/*[clinic end generated code: output=b40d620efe5a896f input=54b428a310debaea]*/
+os__path_isfile_impl(PyObject *module, path_t *path)
+/*[clinic end generated code: output=5c3073bc212b9863 input=4ac1fd350b30a39e]*/
{
- path_t _path = PATH_T_INITIALIZE("_path_isfile", "path", 0, 1);
- return _testFileType(&_path, path, PY_IFREG);
+ return _testFileType(path, PY_IFREG);
}
/*[clinic input]
os._path_islink -> bool
- path: object
+ path: path_t(allow_fd=True, suppress_value_error=True)
Test whether a path is a symbolic link
[clinic start generated code]*/
static int
-os__path_islink_impl(PyObject *module, PyObject *path)
-/*[clinic end generated code: output=9d0cf8e4c640dfe6 input=b71fed60b9b2cd73]*/
+os__path_islink_impl(PyObject *module, path_t *path)
+/*[clinic end generated code: output=30da7bda8296adcc input=7510ce05b547debb]*/
{
- path_t _path = PATH_T_INITIALIZE("_path_islink", "path", 0, 1);
- return _testFileType(&_path, path, PY_IFLNK);
+ return _testFileType(path, PY_IFLNK);
}
#undef PY_IFREG
/*[clinic input]
os._path_normpath
- path: object
+ path: path_t(make_wide=True, nonstrict=True)
-Basic path normalization.
+Normalize path, eliminating double slashes, etc.
[clinic start generated code]*/
static PyObject *
-os__path_normpath_impl(PyObject *module, PyObject *path)
-/*[clinic end generated code: output=b94d696d828019da input=5e90c39e12549dc0]*/
+os__path_normpath_impl(PyObject *module, path_t *path)
+/*[clinic end generated code: output=d353e7ed9410c044 input=3d4ac23b06332dcb]*/
{
- if (!PyUnicode_Check(path)) {
- PyErr_Format(PyExc_TypeError, "expected 'str', not '%.200s'",
- Py_TYPE(path)->tp_name);
- return NULL;
+ PyObject *result;
+ Py_ssize_t norm_len;
+ wchar_t *norm_path = _Py_normpath_and_size((wchar_t *)path->wide,
+ path->length, &norm_len);
+ if (!norm_len) {
+ result = PyUnicode_FromOrdinal('.');
}
- Py_ssize_t len;
- wchar_t *buffer = PyUnicode_AsWideCharString(path, &len);
- if (!buffer) {
- return NULL;
+ else {
+ result = PyUnicode_FromWideChar(norm_path, norm_len);
+ }
+ if (PyBytes_Check(path->object)) {
+ Py_SETREF(result, PyUnicode_EncodeFSDefault(result));
}
- Py_ssize_t norm_len;
- wchar_t *norm_path = _Py_normpath_and_size(buffer, len, &norm_len);
- PyObject *result = PyUnicode_FromWideChar(norm_path, norm_len);
- PyMem_Free(buffer);
return result;
}
name[1] = L'\\';
}
result = PyUnicode_FromWideChar(name, nameLen);
- if (result && path->narrow) {
+ if (result && PyBytes_Check(path->object)) {
Py_SETREF(result, PyUnicode_EncodeFSDefault(result));
}
}
entry->name = PyUnicode_FromWideChar(dataW->cFileName, -1);
if (!entry->name)
goto error;
- if (path->narrow) {
+ int return_bytes = path->wide && PyBytes_Check(path->object);
+ if (return_bytes) {
Py_SETREF(entry->name, PyUnicode_EncodeFSDefault(entry->name));
if (!entry->name)
goto error;
PyMem_Free(joined_path);
if (!entry->path)
goto error;
- if (path->narrow) {
+ if (return_bytes) {
Py_SETREF(entry->path, PyUnicode_EncodeFSDefault(entry->path));
if (!entry->path)
goto error;
projects / thirdparty / Python / cpython.git / commitdiff
