if (sub_pos < int64_t (len)) {
break;
}
- sub_pos -= len;
++i;
+ if (i < _paths.size()) {
+ /* If we've run out of files we need to seek off the end of the last file */
+ sub_pos -= len;
+ }
}
if (i == _paths.size ()) {
- return -1;
+ /* Seeking too far isn't an error; we'll seek too far in the last file which
+ * will "pass on" fseek()'s behaviour to our caller.
+ */
+ i--;
}
ensure_open_path (i);
BOOST_CHECK_EQUAL (fg.read (test, total_length * 3), total_length - pos);
BOOST_CHECK_EQUAL (memcmp (data + pos, test, total_length - pos), 0);
- /* Bad seek */
- BOOST_CHECK_EQUAL (fg.seek (total_length * 2, SEEK_SET), -1);
+ /* Seeking off the end of the file should not give an error */
+ BOOST_CHECK_EQUAL (fg.seek (total_length * 2, SEEK_SET), total_length * 2);
+ /* and attempting to read should return nothing */
+ BOOST_CHECK_EQUAL (fg.read (test, 64), 0);
+ /* but the requested seek should be remembered, so if we now go back (relatively) */
+ BOOST_CHECK_EQUAL (fg.seek (-total_length * 2, SEEK_CUR), 0);
+ /* we should be at the start again */
+ BOOST_CHECK_EQUAL (fg.read (test, 64), 64);
+ BOOST_CHECK_EQUAL (memcmp (data, test, 64), 0);
/* SEEK_SET */
BOOST_CHECK_EQUAL (fg.seek (999, SEEK_SET), 999);