mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-02 21:25:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

dump HAVE_FOPENRF stuff - obsolete

Browse source
This commit is contained in:
Skip Montanaro 2004-06-11 04:49:03 +00:00
parent a5616d2255
commit 51ffac6db7
1 changed files with 19 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Objects/fileobject.c
View file

@ -151,37 +151,30 @@ open_the_file(PyFileObject *f, char *name, char *mode)
return NULL; return NULL;
} }
errno = 0; errno = 0;
#ifdef HAVE_FOPENRF
if (*mode == '*') { if (strcmp(mode, "U") == 0 || strcmp(mode, "rU") == 0)
FILE *fopenRF(); mode = "rb";
f->f_fp = fopenRF(name, mode+1);
}
else
#endif
{
if (strcmp(mode, "U") == 0 || strcmp(mode, "rU") == 0)
mode = "rb";
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
if (PyUnicode_Check(f->f_name)) { if (PyUnicode_Check(f->f_name)) {
PyObject *wmode; PyObject *wmode;
wmode = PyUnicode_DecodeASCII(mode, strlen(mode), NULL); wmode = PyUnicode_DecodeASCII(mode, strlen(mode), NULL);
if (f->f_name && wmode) { if (f->f_name && wmode) {
Py_BEGIN_ALLOW_THREADS
/* PyUnicode_AS_UNICODE OK without thread
lock as it is a simple dereference. */
f->f_fp = _wfopen(PyUnicode_AS_UNICODE(f->f_name),
PyUnicode_AS_UNICODE(wmode));
Py_END_ALLOW_THREADS
}
Py_XDECREF(wmode);
}
#endif
if (NULL == f->f_fp && NULL != name) {
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
f->f_fp = fopen(name, mode); /* PyUnicode_AS_UNICODE OK without thread
lock as it is a simple dereference. */
f->f_fp = _wfopen(PyUnicode_AS_UNICODE(f->f_name),
PyUnicode_AS_UNICODE(wmode));
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
} }
Py_XDECREF(wmode);
} }
#endif
if (NULL == f->f_fp && NULL != name) {
Py_BEGIN_ALLOW_THREADS
f->f_fp = fopen(name, mode);
Py_END_ALLOW_THREADS
}
if (f->f_fp == NULL) { if (f->f_fp == NULL) {
#ifdef _MSC_VER #ifdef _MSC_VER
/* MSVC 6 (Microsoft) leaves errno at 0 for bad mode strings, /* MSVC 6 (Microsoft) leaves errno at 0 for bad mode strings,