extmod/vfs_fat_file: Implement SEEK_CUR for non-zero offset.

aykevl · jepler · commit fa55b15ac6a1 · 2018-03-23T09:19:56.000-05:00
CPython doesn't allow SEEK_CUR with non-zero offset for files in text mode,
and uPy inherited this behaviour for both text and binary files.  It makes
sense to provide full support for SEEK_CUR of binary-mode files in uPy, and
to do this in a minimal way means also allowing to use SEEK_CUR with
non-zero offsets on text-mode files.  That seems to be a fair compromise.
diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
@@ -125,11 +125,7 @@ STATIC mp_uint_t file_obj_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg,
                 break;
 
             case 1: // SEEK_CUR
-                if (s->offset != 0) {
-                    *errcode = MP_EOPNOTSUPP;
-                    return MP_STREAM_ERROR;
-                }
-                // no-operation
+                f_lseek(&self->fp, f_tell(&self->fp) + s->offset);
                 break;
 
             case 2: // SEEK_END
diff --git a/tests/extmod/vfs_fat_fileio1.py b/tests/extmod/vfs_fat_fileio1.py
@@ -91,10 +91,8 @@ def ioctl(self, op, arg):
 
     f2.seek(0, 1) # SEEK_CUR
     print(f2.read(1))
-    try:
-        f2.seek(1, 1) # SEEK_END
-    except OSError as e:
-        print(e.args[0] == uerrno.EOPNOTSUPP)
+    f2.seek(2, 1) # SEEK_CUR
+    print(f2.read(1))
 
     f2.seek(-2, 2) # SEEK_END
     print(f2.read(1))
diff --git a/tests/extmod/vfs_fat_fileio1.py.exp b/tests/extmod/vfs_fat_fileio1.py.exp
@@ -7,7 +7,7 @@ hello!world!
 12
 h
 e
-True
+o
 d
 True
 [('foo_dir', 16384, 0)]

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ hello!world!`
`7`	`7`	`12`
`8`	`8`	`h`
`9`	`9`	`e`
`10`		`-True`
	`10`	`+o`
`11`	`11`	`d`
`12`	`12`	`True`
`13`	`13`	`[('foo_dir', 16384, 0)]`