Fix #35795: A time consumed could be -1

[shogi-server/shogi-server.git] / mk_game_results

diff --git a/mk_game_results b/mk_game_results
index 432cf46..0260f88 100755 (executable)
--- a/mk_game_results
+++ b/mk_game_results
@@ -5,7 +5,7 @@
 # Homepage:: http://sourceforge.jp/projects/shogi-server/
 #
 #--
-# Copyright (C) 2009 Daigo Moriwaki <daigo at debian dot org>
+# Copyright (C) 2009-2012 Daigo Moriwaki <daigo at debian dot org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -35,9 +35,9 @@
 #
 # Sample Command lines that isntall prerequires will work on Debian.
 #
-# * Ruby 1.8.7
+# * Ruby 2.0.0 or later
 #
-#   $ sudo aptitude install ruby1.8
+#   $ sudo aptitude install ruby
 #
 # == Run
 #
@@ -58,7 +58,11 @@ require 'getoptlong'
 # @parameter file an absolute path of a csa file
 #
 def grep(file)
-  str = File.open(file).read
+  if RUBY_VERSION >= "1.9.1"
+    str = File.open(file, "r:EUC-JP").read
+  else
+    str = File.open(file, "r").read
+  end
 
   if /^N\+(.*)$/ =~ str then black_name = $1.strip end
   if /^N\-(.*)$/ =~ str then white_name = $1.strip end