Browse Source

Use int64_t as offset to ext4_fseek.

This change makes it possible to fseek backwards in fseek.

Tested:
  make test_all
pull/33/head
Fan Deng 7 years ago
parent
commit
d8218c9442
  1. 2
      include/ext4.h
  2. 10
      src/ext4.c

2
include/ext4.h

@ -368,7 +368,7 @@ int ext4_fwrite(ext4_file *file, const void *buf, size_t size, size_t *wcnt);
* @ref SEEK_END
*
* @return Standard error code.*/
int ext4_fseek(ext4_file *file, uint64_t offset, uint32_t origin);
int ext4_fseek(ext4_file *file, int64_t offset, uint32_t origin);
/**@brief Get file position.
*

10
src/ext4.c

@ -2016,23 +2016,25 @@ Finish:
return r;
}
int ext4_fseek(ext4_file *file, uint64_t offset, uint32_t origin)
int ext4_fseek(ext4_file *file, int64_t offset, uint32_t origin)
{
switch (origin) {
case SEEK_SET:
if (offset > file->fsize)
if (offset < 0 || (uint64_t)offset > file->fsize)
return EINVAL;
file->fpos = offset;
return EOK;
case SEEK_CUR:
if ((offset + file->fpos) > file->fsize)
if ((offset < 0 && (uint64_t)(-offset) > file->fpos) ||
(offset > 0 &&
(uint64_t)offset > (file->fsize - file->fpos)))
return EINVAL;
file->fpos += offset;
return EOK;
case SEEK_END:
if (offset > file->fsize)
if (offset < 0 || (uint64_t)offset > file->fsize)
return EINVAL;
file->fpos = file->fsize - offset;

Loading…
Cancel
Save