[Python-checkins] python/dist/src/Python sysmodule.c, 2.126,
2.126.2.1
loewis at users.sourceforge.net
loewis at users.sourceforge.net
Sun Jan 23 10:50:16 CET 2005
Update of /cvsroot/python/python/dist/src/Python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26502/Python
Modified Files:
Tag: release24-maint
sysmodule.c
Log Message:
Flush std{in,out,err} before closing it. Fixes #1074011.
Index: sysmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/sysmodule.c,v
retrieving revision 2.126
retrieving revision 2.126.2.1
diff -u -d -r2.126 -r2.126.2.1
--- sysmodule.c 12 Aug 2004 18:19:17 -0000 2.126
+++ sysmodule.c 23 Jan 2005 09:50:14 -0000 2.126.2.1
@@ -927,6 +927,13 @@
)
/* end of sys_doc */ ;
+static int
+_check_and_flush (FILE *stream)
+{
+ int prev_fail = ferror (stream);
+ return fflush (stream) || prev_fail ? EOF : 0;
+}
+
PyObject *
_PySys_Init(void)
{
@@ -940,9 +947,9 @@
m = Py_InitModule3("sys", sys_methods, sys_doc);
sysdict = PyModule_GetDict(m);
- sysin = PyFile_FromFile(stdin, "<stdin>", "r", NULL);
- sysout = PyFile_FromFile(stdout, "<stdout>", "w", NULL);
- syserr = PyFile_FromFile(stderr, "<stderr>", "w", NULL);
+ sysin = PyFile_FromFile(stdin, "<stdin>", "r", _check_and_flush);
+ sysout = PyFile_FromFile(stdout, "<stdout>", "w", _check_and_flush);
+ syserr = PyFile_FromFile(stderr, "<stderr>", "w", _check_and_flush);
if (PyErr_Occurred())
return NULL;
#ifdef MS_WINDOWS
More information about the Python-checkins
mailing list