From 587016b485794e5b34a3965854f46b1cab36e073 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 9 Oct 2011 13:15:12 +0000
Subject: [PATCH] merges r33264 from trunk into ruby_1_9_3. -- * lib/pstore.rb
 (PStore): always open in binary mode even if   default encodings are set. 
 [Bug #5311] [ruby-core:39503]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33440 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog           |  5 +++++
 lib/pstore.rb       |  7 +++----
 test/test_pstore.rb | 18 ++++++++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 930e8fd35b..616136f5f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 13 15:02:48 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/pstore.rb (PStore): always open in binary mode even if
+	  default encodings are set.  [Bug #5311] [ruby-core:39503]
+
 Sat Oct  8 07:31:42 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* array.c (ary_join_1): should not copy the encoding of non-string
diff --git a/lib/pstore.rb b/lib/pstore.rb
index 9fb0249f3c..020b028666 100644
--- a/lib/pstore.rb
+++ b/lib/pstore.rb
@@ -94,10 +94,9 @@ require "thread"
 # Needless to say, if you're storing valuable data with PStore, then you should
 # backup the PStore files from time to time.
 class PStore
-  binmode = defined?(File::BINARY) ? File::BINARY : 0
-  RDWR_ACCESS = File::RDWR | File::CREAT | binmode
-  RD_ACCESS = File::RDONLY | binmode
-  WR_ACCESS = File::WRONLY | File::CREAT | File::TRUNC | binmode
+  RDWR_ACCESS = {mode: IO::RDWR | IO::CREAT | IO::BINARY, encoding: Encoding::ASCII_8BIT}.freeze
+  RD_ACCESS = {mode: IO::RDONLY | IO::BINARY, encoding: Encoding::ASCII_8BIT}.freeze
+  WR_ACCESS = {mode: IO::WRONLY | IO::CREAT | IO::TRUNC | IO::BINARY, encoding: Encoding::ASCII_8BIT}.freeze
 
   # The error type thrown by all PStore methods.
   class Error < StandardError
diff --git a/test/test_pstore.rb b/test/test_pstore.rb
index b5deb9f359..21831903cf 100644
--- a/test/test_pstore.rb
+++ b/test/test_pstore.rb
@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'pstore'
+require_relative 'ruby/envutil'
 
 class PStoreTest < Test::Unit::TestCase
   def setup
@@ -110,4 +111,21 @@ class PStoreTest < Test::Unit::TestCase
       pstore.transaction { pstore.transaction { } }
     end
   end
+
+  # Test that PStore's file operations do not blow up when default encodings are set
+  def test_pstore_files_are_accessed_as_binary_files
+    bug5311 = '[ruby-core:39503]'
+    n = 128
+    assert_in_out_err(["-rpstore", "-", @pstore_file], <<-SRC, [bug5311], [], bug5311)
+      @pstore = PStore.new(ARGV[0])
+      Encoding.default_internal = 'utf-8'
+      Encoding.default_external = 'utf-8'
+      (1..#{n}).each do |i|
+        @pstore.transaction {@pstore["Key\#{i}"] = "value \#{i}"}
+      end
+      @pstore.transaction {@pstore["Bug5311"] = '#{bug5311}'}
+      puts @pstore.transaction {@pstore["Bug5311"]}
+    SRC
+    assert_equal(bug5311, @pstore.transaction {@pstore["Bug5311"]}, bug5311)
+  end
 end