This is the mail archive of the
gcc-bugs@gcc.gnu.org
mailing list for the GCC project.
[Bug libstdc++/11691] stdio_filebuf leaks FILE buffer when "no close" is requested
- From: "bkoz at gcc dot gnu dot org" <gcc-bugzilla at gcc dot gnu dot org>
- To: gcc-bugs at gcc dot gnu dot org
- Date: 5 Dec 2003 23:57:17 -0000
- Subject: [Bug libstdc++/11691] stdio_filebuf leaks FILE buffer when "no close" is requested
- References: <20030728040428.11691.jeffbnews@nc.rr.com>
- Reply-to: gcc-bugzilla at gcc dot gnu dot org
------- Additional Comments From bkoz at gcc dot gnu dot org 2003-12-05 23:57 -------
Ack. I added comments to the wrong bug. Let's try again:
----
I think the bool argument can just be removed: it was put in to deal with the
std streams (cin, cout, etc), and don't really apply to people using
stdio_filebuf for other work.
Or, I can keep the argument but have it do nothing (less impressive, but keeps
the same API). Here's a patch for the first idea, please let me know what you think.
best,
benjamin
2003-12-05 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/11691
* include/ext/stdio_filebuf.h (stdio_filebuf::stdio_filebuf):
Remove __del argument to file descriptor constructor.
* config/io/basic_file_stdio.h (__basic_file::sys_open): Remove
bool argument.
* config/io/basic_file_stdio.cc: Same.
Index: config/io/basic_file_stdio.cc
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/config/io/basic_file_stdio.cc,v
retrieving revision 1.23
diff -c -p -r1.23 basic_file_stdio.cc
*** config/io/basic_file_stdio.cc 22 Oct 2003 15:51:55 -0000 1.23
--- config/io/basic_file_stdio.cc 5 Dec 2003 23:43:21 -0000
*************** namespace std
*** 140,147 ****
}
__basic_file<char>*
! __basic_file<char>::sys_open(int __fd, ios_base::openmode __mode,
! bool __del)
{
__basic_file* __ret = NULL;
int __p_mode = 0;
--- 140,146 ----
}
__basic_file<char>*
! __basic_file<char>::sys_open(int __fd, ios_base::openmode __mode)
{
__basic_file* __ret = NULL;
int __p_mode = 0;
*************** namespace std
*** 151,162 ****
_M_open_mode(__mode, __p_mode, __rw_mode, __c_mode);
if (!this->is_open() && (_M_cfile = fdopen(__fd, __c_mode)))
{
! // Iff __del is true, then close will fclose the fd.
! _M_cfile_created = __del;
!
if (__fd == 0)
setvbuf(_M_cfile, reinterpret_cast<char*>(NULL), _IONBF, 0);
-
__ret = this;
}
return __ret;
--- 150,158 ----
_M_open_mode(__mode, __p_mode, __rw_mode, __c_mode);
if (!this->is_open() && (_M_cfile = fdopen(__fd, __c_mode)))
{
! _M_cfile_created = true;
if (__fd == 0)
setvbuf(_M_cfile, reinterpret_cast<char*>(NULL), _IONBF, 0);
__ret = this;
}
return __ret;
*************** namespace std
*** 199,205 ****
__basic_file<char>*
__basic_file<char>::close()
{
! __basic_file* __retval = static_cast<__basic_file*>(NULL);
if (this->is_open())
{
if (_M_cfile_created)
--- 195,201 ----
__basic_file<char>*
__basic_file<char>::close()
{
! __basic_file* __ret = static_cast<__basic_file*>(NULL);
if (this->is_open())
{
if (_M_cfile_created)
*************** namespace std
*** 207,215 ****
else
fflush(_M_cfile);
_M_cfile = 0;
! __retval = this;
}
! return __retval;
}
streamsize
--- 203,211 ----
else
fflush(_M_cfile);
_M_cfile = 0;
! __ret = this;
}
! return __ret;
}
streamsize
Index: config/io/basic_file_stdio.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/config/io/basic_file_stdio.h,v
retrieving revision 1.15
diff -c -p -r1.15 basic_file_stdio.h
*** config/io/basic_file_stdio.h 16 Oct 2003 22:37:48 -0000 1.15
--- config/io/basic_file_stdio.h 5 Dec 2003 23:43:21 -0000
***************
*** 1,6 ****
// Wrapper of C-language FILE struct -*- C++ -*-
! // Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
--- 1,6 ----
// Wrapper of C-language FILE struct -*- C++ -*-
! // Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
*************** namespace std
*** 74,80 ****
sys_open(__c_file* __file, ios_base::openmode);
__basic_file*
! sys_open(int __fd, ios_base::openmode __mode, bool __del);
__basic_file*
close();
--- 74,80 ----
sys_open(__c_file* __file, ios_base::openmode);
__basic_file*
! sys_open(int __fd, ios_base::openmode __mode);
__basic_file*
close();
Index: include/ext/stdio_filebuf.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/ext/stdio_filebuf.h,v
retrieving revision 1.14
diff -c -p -r1.14 stdio_filebuf.h
*** include/ext/stdio_filebuf.h 12 Nov 2003 01:14:34 -0000 1.14
--- include/ext/stdio_filebuf.h 5 Dec 2003 23:43:22 -0000
*************** namespace __gnu_cxx
*** 65,78 ****
/**
* @param fd An open file descriptor.
* @param mode Same meaning as in a standard filebuf.
- * @param del Whether to close the file on destruction.
* @param size Optimal or preferred size of internal buffer, in chars.
*
* This constructor associates a file stream buffer with an open
! * POSIX file descriptor. Iff @a del is true, then the associated
! * file will be closed when the stdio_filebuf is closed/destroyed.
*/
! stdio_filebuf(int __fd, std::ios_base::openmode __mode, bool __del,
size_t __size = static_cast<size_t>(BUFSIZ));
/**
--- 65,76 ----
/**
* @param fd An open file descriptor.
* @param mode Same meaning as in a standard filebuf.
* @param size Optimal or preferred size of internal buffer, in chars.
*
* This constructor associates a file stream buffer with an open
! * POSIX file descriptor.
*/
! stdio_filebuf(int __fd, std::ios_base::openmode __mode,
size_t __size = static_cast<size_t>(BUFSIZ));
/**
*************** namespace __gnu_cxx
*** 114,123 ****
template<typename _CharT, typename _Traits>
stdio_filebuf<_CharT, _Traits>::
! stdio_filebuf(int __fd, std::ios_base::openmode __mode, bool __del,
! size_t __size)
{
! this->_M_file.sys_open(__fd, __mode, __del);
if (this->is_open())
{
this->_M_mode = __mode;
--- 112,120 ----
template<typename _CharT, typename _Traits>
stdio_filebuf<_CharT, _Traits>::
! stdio_filebuf(int __fd, std::ios_base::openmode __mode, size_t __size)
{
! this->_M_file.sys_open(__fd, __mode);
if (this->is_open())
{
this->_M_mode = __mode;
--
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11691