octave-nkf: libinterp/corefcn/oct-stream.cc comparison

maint: Periodic merge of gui-release to default.

comparison

equal deleted inserted replaced

-:146ce31e5d28
+:bc31d9359cf9
 std::list <void *> input_buf_list;
 while (is && ! is.eof ()
 && (read_to_eof || count < elts_to_read))
 {
+if (! read_to_eof)
+{
+octave_idx_type remaining_elts = elts_to_read - count;
+if (remaining_elts < input_buf_elts)
+input_buf_size = remaining_elts * input_elt_size;
+}
 char *input_buf = new char [input_buf_size];
 is.read (input_buf, input_buf_size);
 size_t gcount = is.gcount ();
 char_count += gcount;
-count += gcount / input_elt_size;
+size_t nel = gcount / input_elt_size;
+count += nel;
 input_buf_list.push_back (input_buf);
-if (is && skip != 0 && count == block_size)
+if (is && skip != 0 && nel == block_size)
 {
-int seek_status = seek (skip, SEEK_CUR);
+// Seek to skip.  If skip would move past EOF,
+// position at EOF.
-if (seek_status < 0)
+off_t orig_pos = tell ();
+seek (0, SEEK_END);
+off_t eof_pos = tell ();
+// Is it possible for this to fail to return us to
+// the original position?
+seek (orig_pos, SEEK_SET);
+size_t remaining = eof_pos - orig_pos;
+if (remaining < skip)
+seek (0, SEEK_END);
+else
+seek (skip, SEEK_CUR);
+if (! is)
 break;
 }
 }
 if (read_to_eof)

Mercurial > octave-nkf