Index: config/io/basic_file_stdio.cc =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/config/io/basic_file_stdio.cc,v retrieving revision 1.25 diff -c -p -r1.25 basic_file_stdio.cc *** config/io/basic_file_stdio.cc 10 Dec 2003 17:37:22 -0000 1.25 --- config/io/basic_file_stdio.cc 3 Feb 2004 18:22:48 -0000 *************** *** 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 --- 1,6 ---- // Wrapper of C-language FILE struct -*- C++ -*- ! // Copyright (C) 2000, 2001, 2002, 2003, 2004 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 *************** *** 70,75 **** --- 70,112 ---- #include // For ::max() and min() + namespace __gnu_internal + { + // Map ios_base::openmode flags to a string for use in fopen(). + // Table of valid combinations as given in [lib.filebuf.members]/2. + static const char* + fopen_mode(std::ios_base::openmode mode) + { + enum + { + in = std::ios_base::in, + out = std::ios_base::out, + trunc = std::ios_base::trunc, + app = std::ios_base::app, + binary = std::ios_base::binary + }; + + switch (mode & (in|out|trunc|app|binary)) + { + case ( out ): return "w"; + case ( out |app ): return "a"; + case ( out|trunc ): return "w"; + case (in ): return "r"; + case (in|out ): return "r+"; + case (in|out|trunc ): return "w+"; + + case ( out |binary): return "wb"; + case ( out |app|binary): return "ab"; + case ( out|trunc |binary): return "wb"; + case (in |binary): return "rb"; + case (in|out |binary): return "r+b"; + case (in|out|trunc |binary): return "w+b"; + + default: return 0; // invalid + } + } + } // namespace __gnu_internal + namespace std { // Definitions for __basic_file. *************** namespace std *** 79,131 **** __basic_file::~__basic_file() { this->close(); } - void - __basic_file::_M_open_mode(ios_base::openmode __mode, int& __p_mode, - int&, 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; - - // Set __c_mode for use in fopen. - // Set __p_mode for use in open. - if (!__testi && __testo && !__testt && !__testa) - { - strcpy(__c_mode, "w"); - __p_mode = O_WRONLY | O_CREAT; - } - if (!__testi && __testo && !__testt && __testa) - { - strcpy(__c_mode, "a"); - __p_mode = O_WRONLY | O_CREAT | O_APPEND; - } - if (!__testi && __testo && __testt && !__testa) - { - strcpy(__c_mode, "w"); - __p_mode = O_WRONLY | O_CREAT | O_TRUNC; - } - - if (__testi && !__testo && !__testt && !__testa) - { - strcpy(__c_mode, "r"); - __p_mode = O_RDONLY; - } - if (__testi && __testo && !__testt && !__testa) - { - strcpy(__c_mode, "r+"); - __p_mode = O_RDWR | O_CREAT; - } - if (__testi && __testo && __testt && !__testa) - { - strcpy(__c_mode, "w+"); - __p_mode = O_RDWR | O_CREAT | O_TRUNC; - } - if (__testb) - strcat(__c_mode, "b"); - } - __basic_file* __basic_file::sys_open(__c_file* __file, ios_base::openmode) { --- 116,121 ---- *************** namespace std *** 144,155 **** __basic_file::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); ! if (!this->is_open() && (_M_cfile = fdopen(__fd, __c_mode))) { _M_cfile_created = true; if (__fd == 0) --- 134,142 ---- __basic_file::sys_open(int __fd, ios_base::openmode __mode) { __basic_file* __ret = NULL; ! const char* __c_mode = __gnu_internal::fopen_mode(__mode); ! if (__c_mode && !this->is_open() ! && (_M_cfile = fdopen(__fd, __c_mode))) { _M_cfile_created = true; if (__fd == 0) *************** namespace std *** 164,176 **** 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()) { #ifdef _GLIBCXX_USE_LFS if ((_M_cfile = fopen64(__name, __c_mode))) --- 151,158 ---- int /*__prot*/) { __basic_file* __ret = NULL; ! const char* __c_mode = __gnu_internal::fopen_mode(__mode); ! if (__c_mode && !this->is_open()) { #ifdef _GLIBCXX_USE_LFS if ((_M_cfile = fopen64(__name, __c_mode))) *************** namespace std *** 309,313 **** #endif return 0; } - } // namespace std --- 291,294 ---- Index: config/io/basic_file_stdio.h =================================================================== RCS file: /cvs/gcc/gcc/libstdc++-v3/config/io/basic_file_stdio.h,v retrieving revision 1.16 diff -c -p -r1.16 basic_file_stdio.h *** config/io/basic_file_stdio.h 7 Dec 2003 03:46:13 -0000 1.16 --- config/io/basic_file_stdio.h 3 Feb 2004 18:22:48 -0000 *************** *** 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 --- 1,6 ---- // Wrapper of C-language FILE struct -*- C++ -*- ! // Copyright (C) 2000, 2001, 2002, 2003, 2004 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 *** 62,72 **** public: __basic_file(__c_lock* __lock = 0); ! ! void ! _M_open_mode(ios_base::openmode __mode, int& __p_mode, int& __rw_mode, ! char* __c_mode); ! __basic_file* open(const char* __name, ios_base::openmode __mode, int __prot = 0664); --- 62,68 ---- public: __basic_file(__c_lock* __lock = 0); ! __basic_file* open(const char* __name, ios_base::openmode __mode, int __prot = 0664);