mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-25 04:08:59 +08:00
d3a193e36c
2002-04-15 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/4164
Valgrind fixes.
* config/io/basic_file_stdio.cc (__basic_file::~__basic_file):
Call close.
(__basic_file::close): Call fflush. Correct return if fclose ok.
(__basic_file::is_open): Make const.
Change __c_file_type to __c_file.
* config/io/basic_file_stdio.h: Change __c_file_type to __c_file.
(__basic_file::is_open): Make const.
* config/io/c_io_stdio.h: Change __c_file_type to __c_file.
* include/std/std_fstream.h (filebuf::_M_allocate_file): Remove.
(filebuf::_M_unbuf): Add.
(filebuf::_M_file): Change to non-pointer.
(filebuf::_M_allocate_pback_buffer): Remove.
* include/bits/fstream.tcc (filebuf::_M_allocate_file): Remove.
(filebuf::_M_allocate_internal_buffer): Use _M_unbuf.
Change initialization list for _M_file change.
(filebuf::_M_allocate_pback_buffer): Remove.
Change _M_file usage to reflect non-pointer data member.
* config/locale/generic/c_locale.cc
(locale::facet::_S_create_c_locale): Add parameter.
* config/locale/generic/collate_members.cc: Change
_M_compare_helper to _M_compare.
Change _M_transform_helper to _M_transform.
* config/locale/generic/monetary_members.cc: Changeup data types.
Add dtors.
* config/locale/generic/numeric_members.cc: Add dtors.
* config/locale/generic/time_members.cc: Add dtors.
* config/locale/gnu/c_locale.cc: Add parameter.
* config/locale/gnu/collate_members.cc:Change
_M_compare_helper to _M_compare.
Change _M_transform_helper to _M_transform.
* config/locale/gnu/ctype_members.cc: Better error checking.
* config/os/gnu-linux/bits/ctype_noninline.h: Better error checking.
* config/locale/gnu/messages_members.cc: Tweak comment.
* config/locale/gnu/monetary_members.cc: Change data types.
Add dtors.
* config/locale/gnu/numeric_members.cc: Add dtors, better error
checking.
* config/locale/gnu/time_members.cc: Same.
* config/locale/ieee_1003.1-2001/c_locale.cc
(locale::facet::_S_create_c_locale): Add parameter.
* config/locale/ieee_1003.1-2001/c_locale.h: Correct typedef.
* config/locale/ieee_1003.1-2001/codecvt_specializations.h: Remove
bogus ctor.
* include/bits/locale_facets.h (moneypunct): Use string literals.
Don't define dtor.
(numpunct): Same.
(__timepunct): Same.
(locale::_Impl::_M_facets): Change from vector to array.
(locale::_Impl::_M_names): Change from array of strings to array
of string literals.
(locale::facet::_S_create_c_locale): Add parameter.
(locale::locale::_S_num_facets): Move to...
(locale::_Impl::_M_facets_size): Here.
* include/bits/locale_facets.tcc: Fixups for _M_facets, _M_name
changes.
* include/bits/localefwd.h: (locale:🆔:_M_id): Add member function.
(locale::_Impl::_Impl(facet**, size_t, bool)): Add.
(locale::_Impl::_Impl(string, size_t)): Change to
(locale::_Impl::_Impl(const char*, size_t)): This.
* include/bits/streambuf.tcc (streambuf::_S_pback_size): Define.
* include/std/std_streambuf.h (streambuf::_M_pback_size): Change to
(streambuf::_S_pback_size): This.
* src/globals.cc: Add pre-allocations for "C" facets.
* src/locale-inst.cc: Remove vector instantiations.
* src/locale.cc: Remove vector include. Fixups for _M_names,
_M_facets changes.
* src/localename.cc: Same.
* include/bits/stl_vector.h: Fix odd formatting.
* include/bits/basic_string.tcc: Tweak comment.
* libsupc++/new: Make sure parameters are uglified.
* libsupc++/typeinfo: Same.
* testsuite/22_locale/num_get_members_char.cc: Fixup.
* testsuite/22_locale/num_get_members_wchar_t.cc: Same.
* testsuite/27_io/filebuf_members.cc: Same.
From-SVN: r52345
205 lines
4.9 KiB
C++
205 lines
4.9 KiB
C++
// Copyright (C) 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
|
|
// terms of the GNU General Public License as published by the
|
|
// Free Software Foundation; either version 2, or (at your option)
|
|
// any later version.
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License along
|
|
// with this library; see the file COPYING. If not, write to the Free
|
|
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
|
// USA.
|
|
|
|
// 27.8.1.3 filebuf member functions
|
|
// @require@ %-*.tst %-*.txt
|
|
// @diff@ %-*.tst %-*.txt
|
|
|
|
// various tests for filebuf::open() and filebuf::close() including
|
|
// the non-portable functionality in the libstdc++-v3 IO library
|
|
|
|
#include <iostream>
|
|
#include <fstream>
|
|
#include <unistd.h>
|
|
#include <signal.h>
|
|
#include <fcntl.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <testsuite_hooks.h>
|
|
|
|
const char name_01[] = "filebuf_members-1.tst";
|
|
const char name_02[] = "filebuf_members-1.txt";
|
|
|
|
// Test member functions.
|
|
void test_01()
|
|
{
|
|
bool test = true;
|
|
const char* name_03 = "filebuf_members-3"; // empty file, need to create
|
|
|
|
std::filebuf fb_01; // in
|
|
std::filebuf fb_02; // out
|
|
std::filebuf fb_03; // in | out
|
|
|
|
// bool is_open()
|
|
VERIFY( !fb_01.is_open() );
|
|
VERIFY( !fb_02.is_open() );
|
|
VERIFY( !fb_03.is_open() );
|
|
|
|
// filebuf_type* open(const char* __s, ios_base::openmode __mode)
|
|
fb_01.open(name_01, std::ios_base::in | std::ios_base::ate);
|
|
fb_02.open(name_02, std::ios_base::in | std::ios_base::out
|
|
| std::ios_base::trunc);
|
|
// Try to open two different files without closing the first:
|
|
// Should keep the old file attached, and disregard attempt to overthrow.
|
|
fb_02.open(name_03, std::ios_base::in | std::ios_base::out);
|
|
fb_03.open(name_03, std::ios_base::out | std::ios_base::trunc);
|
|
VERIFY( fb_01.is_open() );
|
|
VERIFY( fb_02.is_open() );
|
|
VERIFY( fb_03.is_open() );
|
|
|
|
// filebuf_type* close()
|
|
fb_01.close();
|
|
fb_02.close();
|
|
fb_03.close();
|
|
VERIFY( !fb_01.is_open() );
|
|
VERIFY( !fb_02.is_open() );
|
|
VERIFY( !fb_03.is_open() );
|
|
}
|
|
|
|
// Verify that std::filebuf doesn't close files that it didn't open
|
|
// when using the following std::filebuf ctor:
|
|
//
|
|
// std::filebuf(__c_file_type* __f,
|
|
// ios_base::openmode __mode,
|
|
// int_type __s);
|
|
//
|
|
// Thanks to "George T. Talbot" <george@moberg.com> for uncovering
|
|
// this bug/situation.
|
|
void test_02()
|
|
{
|
|
bool test = true;
|
|
int close_num;
|
|
|
|
// read (ext)
|
|
FILE* f2 = fopen(name_01, "r");
|
|
VERIFY( f2 != NULL );
|
|
{
|
|
std::filebuf fb(f2, std::ios_base::in, 512);
|
|
}
|
|
close_num = fclose(f2);
|
|
VERIFY( close_num == 0 );
|
|
|
|
|
|
// read (standard)
|
|
FILE* f = fopen(name_01, "r");
|
|
VERIFY( f != NULL );
|
|
{
|
|
std::ifstream ifstream1(name_01);
|
|
VERIFY( ifstream1.is_open() );
|
|
std::ios_base::iostate st01 = ifstream1.rdstate();
|
|
VERIFY( st01 == std::ios_base::goodbit );
|
|
}
|
|
close_num = fclose(f);
|
|
VERIFY( close_num == 0 );
|
|
}
|
|
|
|
void test_03()
|
|
{
|
|
bool test = true;
|
|
int first_fd = ::open(name_01, O_RDONLY);
|
|
VERIFY( first_fd != -1 );
|
|
FILE* first_file = ::fdopen(first_fd, "r");
|
|
VERIFY( first_file != NULL );
|
|
std::filebuf fb (first_file, std::ios_base::in);
|
|
|
|
int second_fd = fb.fd();
|
|
|
|
VERIFY( first_fd == second_fd );
|
|
}
|
|
|
|
// libstdc++/2913, libstdc++/4879
|
|
// John Fardo <jfardo@laurelnetworks.com>, Brad Garcia <garsh@attbi.com>
|
|
void
|
|
test_04()
|
|
{
|
|
signal(SIGPIPE, SIG_IGN);
|
|
|
|
if (0 != mkfifo("xxx", S_IRWXU))
|
|
{
|
|
std::cerr << "failed to creat fifo" << std::endl;
|
|
exit(-1);
|
|
}
|
|
|
|
int fval = fork();
|
|
if (fval == -1)
|
|
{
|
|
std::cerr << "failed to fork" << std::endl;
|
|
unlink("xxx");
|
|
exit(-1);
|
|
}
|
|
else if (fval == 0)
|
|
{
|
|
std::ifstream ifs("xxx");
|
|
sleep(1);
|
|
ifs.close();
|
|
exit(0);
|
|
}
|
|
|
|
std::ofstream ofs("xxx");
|
|
sleep(2);
|
|
ofs.put('t');
|
|
|
|
/*
|
|
* ISO/IED 14882:1998(E) 27.8.1.10.4
|
|
*
|
|
* void close();
|
|
*
|
|
* Effects: Calls rdbuf()->close() and, if that function fails
|
|
* (returns a null pointer), calls setstate(failbit)...
|
|
*/
|
|
ofs.close();
|
|
if (!(ofs.rdstate() & std::ios::failbit))
|
|
{
|
|
std::cerr << "fail bit was not set!" << std::endl;
|
|
unlink("xxx");
|
|
exit(-1);
|
|
}
|
|
|
|
unlink("xxx");
|
|
exit(0);
|
|
}
|
|
|
|
// Charles Leggett <CGLeggett@lbl.gov>
|
|
void test_05()
|
|
{
|
|
bool test = true;
|
|
|
|
std::fstream scratch_file;
|
|
|
|
scratch_file.open("SCRATCH", std::ios::out);
|
|
scratch_file.close();
|
|
|
|
scratch_file.open("SCRATCH", std::ios::in);
|
|
if (!scratch_file)
|
|
VERIFY( false );
|
|
scratch_file.close();
|
|
}
|
|
|
|
int
|
|
main()
|
|
{
|
|
test_01();
|
|
test_02();
|
|
test_03();
|
|
test_04();
|
|
test_05();
|
|
return 0;
|
|
}
|
|
|
|
|