[ruby-dev:2447] Re: experimental release 1.1b9_11

ふなばです。

くやしかったので、むりして直してみました :-)
# ちゃんとした対応でないのかも。

あと、いつのまにか binmode の値って変っていたんですね (うーん、何故?)。
# こっちも、ひとまず対応しました。


--- parse.y.orig	Thu Apr 16 16:43:20 1998
+++ parse.y	Tue Apr 21 01:58:26 1998
@@ -1982,7 +1982,7 @@
     newtok();
 
     while ((c = nextc()) != term || nest > 0) {
-	if (c  == -1) {
+	if (c == -1) {
 	  unterm_str:
 	    sourceline = strstart;
 	    Error("unterminated string meets end of file");
@@ -2053,7 +2053,7 @@
     strstart = sourceline;
     newtok();
     while ((c = nextc()) != term || nest > 0) {
-	if (c  == -1)  {
+	if (c == -1)  {
 	    sourceline = strstart;
 	    Error("unterminated string meets end of file");
 	    return 0;
@@ -2131,7 +2131,7 @@
 	break;
 
       default:
-	c =  term;
+	c = term;
 	term = '"';
 	if (!is_identchar(c)) {
 	    yyerror("illegal here document");
@@ -2169,7 +2169,7 @@
 
 	lex_pbeg = lex_p = RSTRING(line)->ptr;
 	lex_pend = lex_p + RSTRING(line)->len;
-	switch (parse_string(term, '\n')) {
+	switch (parse_string(term, '\n', -1)) {
 	  case tSTRING:
 	  case tXSTRING:
 	    str_cat(yylval.val, "\n", 1);


--- rar.rb.orig	Tue Apr 21 00:12:03 1998
+++ rar.rb	Tue Apr 21 01:56:06 1998
@@ -28,7 +28,8 @@
 def create_file(file, text, mode, size, atime, mtime)
   restore_sentinel(file) do
     open(file, 'w') do |output|
-      output.binmode.write text.unpack('m')[0]
+      output.binmode
+      output.write text.unpack('m')[0]
     end
     File.chmod(mode, file)
     File.utime(atime, mtime, file)
@@ -91,7 +92,8 @@
   store_sentinel(file) do
     text = mode = size = atime = mtime = nil
     open(file, 'r') do |input|
-      text = (input.binmode.read or '')
+      input.binmode
+      text = (input.read or '')
       mode = input.stat.mode & 0777
       size = input.stat.size
       atime = input.stat.atime.to_i


--Tadayoshi Funaba