From: Benjamin Kosnik Date: Wed, 28 Feb 2001 03:26:44 +0000 (+0000) Subject: basic_file.h: Include basic_file_model.h. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=115b5a7e47ff92545e183403ef57f9397436f0f9;p=gcc.git basic_file.h: Include basic_file_model.h. 2001-02-27 Benjamin Kosnik libstdc++/1886 * include/bits/basic_file.h: Include basic_file_model.h. * config/c_io_libio.cc: Move to... * config/basic_file_libio.cc: Here. * config/basic_file_libio.h: New file. * config/c_io_stdio.cc: Move to... * config/basic_file_stdio.cc: Here. * config/basic_file_stdio.h: New file. * config/c_io_libio.h: Tweak. * config/c_io_stdio.h: Tweak. * src/Makefile.am (build_headers): Add basic_file_model.h. (sources): Add basic_file.cc, remove c++io.cc. * src/Makefile.in: Regenerate. * acinclude.m4 (GLIBCPP_ENABLE_CSTDIO): Add support for basic_file_model.h and basic_file.cc. * aclocal.m4: Regenerate. * configure: Regenerate. * testsuite/27_io/filebuf.cc (test05): Add regression. From-SVN: r40109 --- diff --git a/libstdc++-v3/config/c_io_libio.cc b/libstdc++-v3/config/c_io_libio.cc deleted file mode 100644 index 1747ddb3e6d..00000000000 --- a/libstdc++-v3/config/c_io_libio.cc +++ /dev/null @@ -1,447 +0,0 @@ -// Wrapper of C-language FILE struct -*- C++ -*- - -// Copyright (C) 2000 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. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -// -// ISO C++ 14882: 27.8 File-based streams -// - -#include -#include - -namespace std { - - // __basic_file specializations - template<> - __basic_file::__basic_file(__c_lock* __lock); - - template<> - int - __basic_file::overflow(int __c); - - template<> - int - __basic_file::underflow(); - - template<> - int - __basic_file::uflow(); - - template<> - int - __basic_file::pbackfail(int __c); - - template<> - streamsize - __basic_file::xsputn(const char* __s, streamsize __n); - - template<> - streamoff - __basic_file::seekoff(streamoff __off, ios_base::seekdir __way, - ios_base::openmode __mode); - - template<> - streamoff - __basic_file::seekpos(streamoff __pos, ios_base::openmode __mode); - - template<> - streambuf* - __basic_file::setbuf(char* __b, int __len); - - template<> - int - __basic_file::sync(); - - template<> - int - __basic_file::doallocate(); - - // __basic_file specializations -#ifdef _GLIBCPP_USE_WCHAR_T - template<> - __basic_file::__basic_file(__c_lock* __lock); - - template<> - int - __basic_file::overflow(int __c); - - template<> - int - __basic_file::underflow(); - - template<> - int - __basic_file::uflow(); - - template<> - int - __basic_file::pbackfail(int __c); - - template<> - streamsize - __basic_file::xsputn(const wchar_t* __s, streamsize __n); - - template<> - streamoff - __basic_file::seekoff(streamoff __off, ios_base::seekdir __way, - ios_base::openmode __mode); - - template<> - streamoff - __basic_file::seekpos(streamoff __pos, ios_base::openmode __mode); - - template<> - streambuf* - __basic_file::setbuf(wchar_t* __b, int __len); - - template<> - int - __basic_file::sync(); - - template<> - int - __basic_file::doallocate(); -#endif - - // Generic definitions for __basic_file - template - int - __basic_file<_CharT>::get_fileno(void) - { return _fileno; } - - template - __basic_file<_CharT>::~__basic_file() - { _IO_file_finish(this, 0); } - - template - void - __basic_file<_CharT>::_M_open_mode(ios_base::openmode __mode, - int& __p_mode, int& __rw_mode, - char* /*__c_mode*/) - { -#ifdef O_BINARY - bool __testb = __mode & ios_base::binary; -#endif - bool __testi = __mode & ios_base::in; - bool __testo = __mode & ios_base::out; - bool __testt = __mode & ios_base::trunc; - bool __testa = __mode & ios_base::app; - - if (!__testi && __testo && !__testt && !__testa) - { - __p_mode = O_WRONLY | O_TRUNC | O_CREAT; - __rw_mode = _IO_NO_READS; - } - if (!__testi && __testo && !__testt && __testa) - { - __p_mode = O_WRONLY | O_APPEND | O_CREAT; - __rw_mode = _IO_NO_READS | _IO_IS_APPENDING; - } - if (!__testi && __testo && __testt && !__testa) - { - __p_mode = O_WRONLY | O_TRUNC | O_CREAT; - __rw_mode = _IO_NO_READS; - } - if (__testi && !__testo && !__testt && !__testa) - { - __p_mode = O_RDONLY; - __rw_mode = _IO_NO_WRITES; - } - if (__testi && __testo && !__testt && !__testa) - { - __p_mode = O_RDWR; - __rw_mode = 0; - } - if (__testi && __testo && __testt && !__testa) - { - __p_mode = O_RDWR | O_TRUNC | O_CREAT; - __rw_mode = 0; - } -#ifdef O_BINARY - if (__testb) - __p_mode |= O_BINARY; -#endif - } - - template - __basic_file<_CharT>* - __basic_file<_CharT>::sys_open(int __fd, ios_base::openmode __mode) - { - __basic_file* __ret = NULL; - int __p_mode = 0; - int __rw_mode = _IO_NO_READS + _IO_NO_WRITES; - char __c_mode[4]; - - _M_open_mode(__mode, __p_mode, __rw_mode, __c_mode); - - if (!_IO_file_is_open(this)) - { - _fileno = __fd; - _flags &= ~(_IO_NO_READS+_IO_NO_WRITES); - _flags |= _IO_DELETE_DONT_CLOSE; - _offset = _IO_pos_BAD; - int __mask = _IO_NO_READS + _IO_NO_WRITES + _IO_IS_APPENDING; - _IO_mask_flags(this, __rw_mode, __mask); - } - - return __ret; - } - - template - __basic_file<_CharT>* - __basic_file<_CharT>::open(const char* __name, ios_base::openmode __mode, - int __prot) - { - __basic_file* __ret = NULL; - int __p_mode = 0; - int __rw_mode = _IO_NO_READS + _IO_NO_WRITES; - char __c_mode[4]; - - _M_open_mode(__mode, __p_mode, __rw_mode, __c_mode); - if (!_IO_file_is_open(this)) - { - __c_file_type* __f; - __f = _IO_file_open(this, __name, __p_mode, __prot, __rw_mode, 0); - __ret = __f ? this: NULL; - } - return __ret; - } - - template - bool - __basic_file<_CharT>::is_open() { return _fileno >= 0; } - - template - __basic_file<_CharT>* - __basic_file<_CharT>::close() - { - return _IO_file_close_it(this) ? static_cast<__basic_file*>(NULL) : this; - } - - template - streamsize - __basic_file<_CharT>::xsgetn(_CharT* __s, streamsize __n) - { return _IO_file_xsgetn(this, __s, __n); } - - // NB: Unused. - template - streamsize - __basic_file<_CharT>::sys_read(_CharT* __s, streamsize __n) - { return _IO_file_read(this, __s, __n); } - - // NB: Unused. - template - streamsize - __basic_file<_CharT>::sys_write(const _CharT* __s, streamsize __n) - { return _IO_file_write(this, __s, __n); } - - // NB: Unused. - template - streamoff - __basic_file<_CharT>::sys_seek(streamoff __pos, ios_base::seekdir __way) - { return _IO_file_seek(this, __pos, __way); } - - // NB: Unused. - template - int - __basic_file<_CharT>::sys_close() - { return _IO_file_close(this); } - - // NB: Unused. - template - int - __basic_file<_CharT>::sys_stat(void* __v) - { return _IO_file_stat(this, __v); } - - // NB: Unused. - template - int - __basic_file<_CharT>::showmanyc() { return EOF; } - - // NB: Unused. - template - void - __basic_file<_CharT>::imbue(void* /*__v*/) { } - - // __basic_file definitions - __basic_file::__basic_file(__c_lock* __lock) - { -#ifdef _IO_MTSAFE_IO - _lock = __lock; -#endif - // Don't set the orientation of the stream when initializing. -#ifdef _GLIBCPP_USE_WCHAR_T - _IO_no_init(this, 0, 0, &_M_wfile, 0); -#else /* !defined(_GLIBCPP_USE_WCHAR_T) */ - _IO_no_init(this, 0, 0, NULL, 0); -#endif /* !defined(_GLIBCPP_USE_WCHAR_T) */ - _IO_JUMPS((_IO_FILE_plus *) this) = &_IO_file_jumps; - _IO_file_init((_IO_FILE_plus*)this); - } - - // NB: Unused. - int - __basic_file::overflow(int __c) - { return _IO_file_overflow(this, __c); } - - // NB: Unused. - int - __basic_file::underflow() - { return _IO_file_underflow(this); } - - // NB: Unused. - int - __basic_file::uflow() - { return _IO_default_uflow(this); } - - // NB: Unused. - int - __basic_file::pbackfail(int __c) - { return _IO_default_pbackfail(this, __c); } - - streamsize - __basic_file::xsputn(const char* __s, streamsize __n) - { return _IO_file_xsputn(this, __s, __n); } - - streamoff - __basic_file::seekoff(streamoff __off, ios_base::seekdir __way, - ios_base::openmode __mode) - { return _IO_file_seekoff(this, __off, __way, __mode); } - - streamoff - __basic_file::seekpos(streamoff __pos, ios_base::openmode __mode) - { return _IO_file_seekoff(this, __pos, ios_base::beg, __mode); } - - // NB: Unused. - streambuf* - __basic_file::setbuf(char* __b, int __len) - { return (streambuf*) _IO_file_setbuf(this,__b, __len); } - - int - __basic_file::sync() - { return _IO_file_sync(this); } - - // NB: Unused. - int - __basic_file::doallocate() - { return _IO_file_doallocate(this); } - - // __basic_file definitions -#ifdef _GLIBCPP_USE_WCHAR_T - __basic_file::__basic_file(__c_lock* __lock) - { -#ifdef _IO_MTSAFE_IO - _lock = __lock; -#endif - // Don't set the orientation of the stream when initializing. - _IO_no_init(this, 0, 0, &_M_wfile, &_IO_wfile_jumps); - _IO_JUMPS((_IO_FILE_plus *) this) = &_IO_wfile_jumps; - _IO_file_init((_IO_FILE_plus*)this); - - // In addition, need to allocate the buffer... - _IO_wdoallocbuf(this); - // Setup initial positions for this buffer... - // if (!(_flags & _IO_NO_READS)) - _IO_wsetg(this, _wide_data->_IO_buf_base, _wide_data->_IO_buf_base, - _wide_data->_IO_buf_base); - // if (!(_flags & _IO_NO_WRITES)) - _IO_wsetp(this, _wide_data->_IO_buf_base, _wide_data->_IO_buf_base); - - // Setup codecvt bits... - _codecvt = &__c_libio_codecvt; - - // Do the same for narrow bits... - if (_IO_write_base == NULL) - { - _IO_doallocbuf(this); - // if (!(_flags & _IO_NO_READS)) - _IO_setg(this, _IO_buf_base, _IO_buf_base, _IO_buf_base); - // if (!(_flags & _IO_NO_WRITES)) - _IO_setp(this, _IO_buf_base, _IO_buf_base); - } - } - - int - __basic_file::overflow(int __c) - { return _IO_wfile_overflow(this, __c); } - - int - __basic_file::underflow() - { return _IO_wfile_underflow(this); } - - // NB: Unused. - int - __basic_file::uflow() - { return _IO_wdefault_uflow(this); } - - // NB: Unused. - int - __basic_file::pbackfail(int __c) - { return _IO_wdefault_pbackfail(this, __c); } - - streamsize - __basic_file::xsputn(const wchar_t* __s, streamsize __n) - { return _IO_wfile_xsputn(this, __s, __n); } - - streamoff - __basic_file::seekoff(streamoff __off, ios_base::seekdir __way, - ios_base::openmode __mode) - { return _IO_wfile_seekoff(this, __off, __way, __mode); } - - streamoff - __basic_file::seekpos(streamoff __pos, ios_base::openmode __mode) - { return _IO_wfile_seekoff(this, __pos, ios_base::beg, __mode); } - - streambuf* - __basic_file::setbuf(wchar_t* __b, int __len) - { return (streambuf*) _IO_wfile_setbuf(this,__b, __len); } - - int - __basic_file::sync() - { return _IO_wfile_sync(this); } - - int - __basic_file::doallocate() - { return _IO_wfile_doallocate(this); } -#endif - - // Need to instantiate base class here for type-info bits, etc - template struct __basic_file_base; - template class __basic_file; -#ifdef _GLIBCPP_USE_WCHAR_T - template struct __basic_file_base; - template class __basic_file; -#endif -} // namespace std - - - - - - - diff --git a/libstdc++-v3/config/c_io_stdio.cc b/libstdc++-v3/config/c_io_stdio.cc deleted file mode 100644 index c9ac7705c55..00000000000 --- a/libstdc++-v3/config/c_io_stdio.cc +++ /dev/null @@ -1,269 +0,0 @@ -// Wrapper of C-language FILE struct -*- C++ -*- - -// Copyright (C) 2000, 2001 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. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -// -// ISO C++ 14882: 27.8 File-based streams -// - -#include -#include - -namespace std { - - // Generic definitions for __basic_file - template - __basic_file<_CharT>::__basic_file(__c_lock* /*__lock*/) - : _M_fileno(-1), _M_cfile(NULL) { } - - template - int - __basic_file<_CharT>::get_fileno(void) - { return _M_fileno; } - - template - __basic_file<_CharT>::~__basic_file() - { - if (this->is_open()) - { - fflush(_M_cfile); - this->close(); - } - } - - template - void - __basic_file<_CharT>::_M_open_mode(ios_base::openmode __mode, - int& /*__p_mode*/, int& /*__rw_mode*/, - char* __c_mode) - { - bool __testb = __mode & ios_base::binary; - bool __testi = __mode & ios_base::in; - bool __testo = __mode & ios_base::out; - bool __testt = __mode & ios_base::trunc; - bool __testa = __mode & ios_base::app; - - if (!__testi && __testo && !__testt && !__testa) - strcpy(__c_mode, "w"); - if (!__testi && __testo && !__testt && __testa) - strcpy(__c_mode, "a"); - if (!__testi && __testo && __testt && !__testa) - strcpy(__c_mode, "w"); - if (__testi && !__testo && !__testt && !__testa) - strcpy(__c_mode, "r"); - if (__testi && __testo && !__testt && !__testa) - strcpy(__c_mode, "r+"); - if (__testi && __testo && __testt && !__testa) - strcpy(__c_mode, "w+"); - if (__testb) - strcat(__c_mode, "b"); - } - - template - __basic_file<_CharT>* - __basic_file<_CharT>::sys_open(int __fd, ios_base::openmode __mode) - { - __basic_file* __ret = NULL; - int __p_mode = 0; - int __rw_mode = 0; - char __c_mode[4]; - - _M_open_mode(__mode, __p_mode, __rw_mode, __c_mode); - - int __dupfd = dup(__fd); - - if (__dupfd != -1 && !this->is_open()) - { - if ((_M_cfile = fdopen(__dupfd, __c_mode))) - { - _M_fileno = __dupfd; - __ret = this; - } - } - - return __ret; - } - - template - __basic_file<_CharT>* - __basic_file<_CharT>::open(const char* __name, ios_base::openmode __mode, - int /*__prot*/) - { - __basic_file* __ret = NULL; - int __p_mode = 0; - int __rw_mode = 0; - char __c_mode[4]; - - _M_open_mode(__mode, __p_mode, __rw_mode, __c_mode); - - if (!this->is_open()) - { - if ((_M_cfile = fopen(__name, __c_mode))) - { - _M_fileno = fileno(_M_cfile); - __ret = this; - } - } - return __ret; - } - - template - bool - __basic_file<_CharT>::is_open() { return _M_fileno >= 0; } - - template - __basic_file<_CharT>* - __basic_file<_CharT>::close() - { - __basic_file* __retval = static_cast<__basic_file*>(NULL); - bool __testopen = fclose(_M_cfile); - if (!__testopen) - { - __retval = this; - _M_fileno = -1; - } - return __retval; - } - - template - streamsize - __basic_file<_CharT>::xsgetn(_CharT* __s, streamsize __n) - { return fread(__s, 1, __n, _M_cfile); } - - template - streamsize - __basic_file<_CharT>::xsputn(const _CharT* __s, streamsize __n) - { return fwrite(__s, 1, __n, _M_cfile); } - - template - streamoff - __basic_file<_CharT>::seekoff(streamoff __off, ios_base::seekdir __way, - ios_base::openmode /*__mode*/) - { fseek(_M_cfile, __off, __way); return ftell(_M_cfile); } - - template - streamoff - __basic_file<_CharT>::seekpos(streamoff __pos, - ios_base::openmode /*__mode*/) - { fseek(_M_cfile, __pos, ios_base::beg); return ftell(_M_cfile); } - - template - int - __basic_file<_CharT>::sync() - { return fflush(_M_cfile); } - - // NB: Unused. - template - int - __basic_file<_CharT>::overflow(int /*__c*/) - { return EOF; } - - // NB: Unused. - template - int - __basic_file<_CharT>::underflow() - { return EOF; } - - // NB: Unused. - template - int - __basic_file<_CharT>::uflow() - { return EOF; } - - // NB: Unused. - template - int - __basic_file<_CharT>::pbackfail(int /*__c*/) - { return EOF; } - - // NB: Unused. - template - streambuf* - __basic_file<_CharT>::setbuf(_CharT* /*__b*/, int /*__len*/) - { return reinterpret_cast(this); } - - // NB: Unused. - template - int - __basic_file<_CharT>::doallocate() - { return EOF; } - - // NB: Unused. - template - streamsize - __basic_file<_CharT>::sys_read(_CharT* __s, streamsize __n) - { return fread(__s, 1, __n, _M_cfile); } - - // NB: Unused. - template - streamsize - __basic_file<_CharT>::sys_write(const _CharT* __s, streamsize __n) - { return fwrite(__s, 1, __n, _M_cfile); } - - // NB: Unused. - template - streamoff - __basic_file<_CharT>::sys_seek(streamoff __pos, ios_base::seekdir __way) - { - fseek(_M_cfile, __pos, __way); - return ftell(_M_cfile); - } - - // NB: Unused. - template - int - __basic_file<_CharT>::sys_close() - { return fclose(_M_cfile); } - - // NB: Unused. - template - int - __basic_file<_CharT>::sys_stat(void* /*__v*/) - { return EOF; } - - // NB: Unused. - template - int - __basic_file<_CharT>::showmanyc() - { return EOF; } - - // NB: Unused. - template - void - __basic_file<_CharT>::imbue(void* /*__v*/) { } - - // Need to instantiate base class here for type-info bits, etc - template struct __basic_file_base; - template class __basic_file; -#ifdef _GLIBCPP_USE_WCHAR_T - template struct __basic_file_base; - template class __basic_file; -#endif -} // namespace std - -