basic_file_stdio.cc: As an extension...

2006-10-01  Paolo Carlini  <pcarlini@suse.de>

	* config/io/basic_file_stdio.cc: As an extension, and
	consistently with C facilities, allow for in|out|app and
	in|out|app|binary openmodes.
	* testsuite/27_io/basic_filebuf/open/char/4.cc: New.

From-SVN: r117346

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 21e0e1597e5684dfdb7d9610c06126f85a3e25e3..b843fb4c8b501b95c3c93d1104e4a9e70598329f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-01  Paolo Carlini  <pcarlini@suse.de>
+
+       * config/io/basic_file_stdio.cc: As an extension, and
+       consistently with C facilities, allow for in|out|app and
+       in|out|app|binary openmodes.
+       * testsuite/27_io/basic_filebuf/open/char/4.cc: New.
+
 2006-09-30  Benjamin Kosnik  <bkoz@redhat.com>
 
        * include/ext/pb_ds/detail/types_traits.hpp (store_extra_false_type):

diff --git a/libstdc++-v3/config/io/basic_file_stdio.cc b/libstdc++-v3/config/io/basic_file_stdio.cc
index 2bc17baead9c3adc85aff4724ab74f95211ad16f..41d914ad8599907061a5189a224d7078127dcd4b 100644 (file)
--- a/libstdc++-v3/config/io/basic_file_stdio.cc
+++ b/libstdc++-v3/config/io/basic_file_stdio.cc
@@ -95,6 +95,8 @@ namespace
       case (in                     ): return "r";  
       case (in|out                 ): return "r+"; 
       case (in|out|trunc           ): return "w+"; 
+      // Extension to Table 92.
+      case (in|out      |app       ): return "a+"; 
        
       case (   out          |binary): return "wb"; 
       case (   out      |app|binary): return "ab"; 
@@ -102,6 +104,8 @@ namespace
       case (in              |binary): return "rb"; 
       case (in|out          |binary): return "r+b";
       case (in|out|trunc    |binary): return "w+b";
+      // Extension to Table 92.
+      case (in|out      |app|binary): return "a+b";
        
       default: return 0; // invalid
       }

diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/4.cc
new file mode 100644 (file)
index 0000000..dde8086
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/4.cc
@@ -0,0 +1,51 @@
+// 2006-10-01  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2006 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+#include <fstream>
+#include <testsuite_hooks.h>
+
+// As an extension to Table 92, consistently with the C standards, we also
+// allow in|out|app and in|out|app|binary.
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  const char* name = "tmp_file4";
+
+  std::fstream scratch_file;
+
+  scratch_file.open(name, std::ios_base::in | std::ios_base::out
+                   | std::ios_base::app);
+  VERIFY( scratch_file );
+  VERIFY( scratch_file.is_open() );
+  scratch_file.close();
+
+  scratch_file.open(name, std::ios_base::in | std::ios_base::out
+                   | std::ios_base::app | std::ios_base::binary);
+  VERIFY( scratch_file );
+  VERIFY( scratch_file.is_open() );  
+  scratch_file.close();
+}
+
+int
+main()
+{
+  test01();
+  return 0;
+}