From f52b705be42d61066a6f4668146376470c28d8d5 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sat, 14 Aug 2010 17:06:04 +0000 Subject: [PATCH] Create _Py_fopen() for PyUnicodeObject path Call _wfopen() on Windows, or fopen() otherwise. Return the new file object on success, or NULL if the file cannot be open or (if PyErr_Occurred()) on unicode error. --- Include/Python.h | 3 ++- Python/import.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/Include/Python.h b/Include/Python.h index eb5ea28b27d..5afde02d2f0 100644 --- a/Include/Python.h +++ b/Include/Python.h @@ -135,7 +135,8 @@ PyAPI_FUNC(wchar_t *) _Py_char2wchar(char *); PyAPI_FUNC(char*) _Py_wchar2char(const wchar_t *text); PyAPI_FUNC(FILE *) _Py_wfopen(const wchar_t *path, const wchar_t *mode); -/* _Py_stat lives in import.c */ +/* These functions live in import.c */ +PyAPI_FUNC(FILE*) _Py_fopen(PyObject *unicode, const char *mode); #ifdef HAVE_STAT int _Py_stat(PyObject *unicode, struct stat *statbuf); #endif diff --git a/Python/import.c b/Python/import.c index 84ddc03c524..bb3756ef81e 100644 --- a/Python/import.c +++ b/Python/import.c @@ -1960,6 +1960,39 @@ case_ok(char *buf, Py_ssize_t len, Py_ssize_t namelen, char *name) #endif } +/* Call _wfopen() on Windows, or fopen() otherwise. Return the new file + object on success, or NULL if the file cannot be open or (if + PyErr_Occurred()) on unicode error */ + +FILE* +_Py_fopen(PyObject *unicode, const char *mode) +{ +#ifdef MS_WINDOWS + wchar_t path[MAXPATHLEN+1]; + wchar_t wmode[10]; + Py_ssize_t len; + int usize; + + len = PyUnicode_AsWideChar((PyUnicodeObject*)unicode, path, MAXPATHLEN); + if (len == -1) + return NULL; + path[len] = L'\0'; + + usize = MultiByteToWideChar(CP_ACP, 0, mode, -1, wmode, sizeof(wmode)); + if (usize == 0) + return NULL; + + return _wfopen(path, wmode); +#else + FILE *f; + PyObject *bytes = PyUnicode_EncodeFSDefault(unicode); + if (bytes == NULL) + return NULL; + f = fopen(PyBytes_AS_STRING(bytes), mode); + Py_DECREF(bytes); + return f; +#endif +} #ifdef HAVE_STAT