Changeset 331 for EcnlProtoTool/trunk/mrbgems/mruby-io/mrblib/io.rb

Timestamp:

Jan 21, 2018, 12:10:09 AM (6 years ago)

Author:

coas-nagasima

Message:

prototoolに関連するプロジェクトをnewlibからmuslを使うよう変更・更新
ntshellをnewlibの下位の実装から、muslのsyscallの実装に変更・更新
以下のOSSをアップデート
・mruby-1.3.0
・musl-1.1.18
・onigmo-6.1.3
・tcc-0.9.27
以下のOSSを追加
・openssl-1.1.0e
・curl-7.57.0
・zlib-1.2.11
以下のmrbgemsを追加
・iij/mruby-digest
・iij/mruby-env
・iij/mruby-errno
・iij/mruby-iijson
・iij/mruby-ipaddr
・iij/mruby-mock
・iij/mruby-require
・iij/mruby-tls-openssl

File:

• EcnlProtoTool/trunk/mrbgems/mruby-io/mrblib/io.rb (modified) (10 diffs)

EcnlProtoTool/trunk/mrbgems/mruby-io/mrblib/io.rb

@@ -124 +124 @@
     str = string.is_a?(String) ? string : string.to_s
     return str.size unless str.size > 0
-
+    if 0 < @buf.length
+      # reset real pos ignore buf
+      seek(pos, SEEK_SET)
+    end
     len = syswrite(str)
-    if len != -1
-      @pos += len
-      return len
-    end
-
-    raise IOError
+    len
   end
 
@@ -152 +150 @@
   def pos
     raise IOError if closed?
-    @pos
+    sysseek(0, SEEK_CUR) - @buf.length
   end
   alias_method :tell, :pos
@@ -166 +164 @@
   def seek(i, whence = SEEK_SET)
     raise IOError if closed?
-    @pos = sysseek(i, whence)
+    sysseek(i, whence)
     @buf = ''
     0
@@ -178 +176 @@
   def ungetc(substr)
     raise TypeError.new "expect String, got #{substr.class}" unless substr.is_a?(String)
-    @pos -= substr.size
     if @buf.empty?
       @buf = substr.dup
@@ -187 +184 @@
   end
 
-  def read(length = nil)
+  def read(length = nil, outbuf = "")
     unless length.nil?
       unless length.is_a? Fixnum
@@ -201 +198 @@
 
     array = []
-    start_pos = @pos
     while 1
       begin
         _read_buf
-      rescue EOFError => e
+      rescue EOFError
         array = nil if array.empty? and (not length.nil?) and length != 0
         break
       end
 
-      if length && (@pos - start_pos + @buf.size) >= length
-        len = length - (@pos - start_pos)
-        array.push @buf[0, len]
-        @pos += len
-        @buf = @buf[len, @buf.size - len]
-        break
+      if length
+        consume = (length <= @buf.size) ? length : @buf.size
+        array.push @buf[0, consume]
+        @buf = @buf[consume, @buf.size - consume]
+        length -= consume
+        break if length == 0
       else
         array.push @buf
-        @pos += @buf.size
         @buf = ''
       end
     end
 
-    array && array.join
+    if array.nil?
+      outbuf.replace("")
+      nil
+    else
+      outbuf.replace(array.join)
+    end
   end
 
@@ -246 +246 @@
 
     array = []
-    start_pos = @pos
     while 1
       begin
         _read_buf
-      rescue EOFError => e
+      rescue EOFError
         array = nil if array.empty?
         break
       end
 
-      if limit && (@pos - start_pos + @buf.size) >= limit
-        len = limit - (@pos - start_pos)
-        array.push @buf[0, len]
-        @pos += len
-        @buf = @buf[len, @buf.size - len]
+      if limit && limit <= @buf.size
+        array.push @buf[0, limit]
+        @buf = @buf[limit, @buf.size - limit]
         break
       elsif idx = @buf.index(rs)
         len = idx + rs.size
         array.push @buf[0, len]
-        @pos += len
         @buf = @buf[len, @buf.size - len]
         break
       else
         array.push @buf
-        @pos += @buf.size
         @buf = ''
       end
@@ -282 +277 @@
     begin
       readline(*args)
-    rescue EOFError => e
+    rescue EOFError
       nil
     end
@@ -291 +286 @@
     c = @buf[0]
     @buf = @buf[1, @buf.size]
-    @pos += 1
     c
   end
@@ -298 +292 @@
     begin
       readchar
-    rescue EOFError => e
+    rescue EOFError
       nil
     end