read_bytes_term(): follow the Ruby implementation more

See https://github.com/kaitai-io/kaitai_struct_ruby_runtime/blob/a203e14b8ca2549aa9847469d00239165d6649f4/lib/kaitai/struct/struct.rb#L390-L409
kaitai-io · Jul 31, 2024 · c0b39b0 · c0b39b0
1 parent 4047fd9
commit c0b39b0
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/lib/Kaitai/Struct/Stream.php b/lib/Kaitai/Struct/Stream.php
@@ -325,27 +325,27 @@ public function readBytesTerm($term, bool $includeTerm, bool $consumeTerm, bool
         if (is_int($term)) {
             $term = chr($term);
         }
-        $bytes = '';
+        $r = '';
         while (true) {
-            if ($this->isEof()) {
+            $c = fgetc($this->stream);
+            if ($c === false) {
                 if ($eosError) {
                     throw new NoTerminatorFoundError($term);
                 }
                 break;
             }
-            $byte = $this->readBytes(1);
-            if ($byte === $term) {
+            if ($c === $term) {
                 if ($includeTerm) {
-                    $bytes .= $byte;
+                    $r .= $c;
                 }
                 if (!$consumeTerm) {
                     $this->seek($this->pos() - 1);
                 }
                 break;
             }
-            $bytes .= $byte;
+            $r .= $c;
         }
-        return $bytes;
+        return $r;
     }
 
     /**