michaelh/zephyr
1
0
Fork 0
Code Releases Activity

fs: fs_seek and fs_tell return -ENOTSUP when not implemented

Browse source 
Simple change that makes fs_seek and fs_tell return -ENOTSUP when
file system does not implement the seek/tell.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
This commit is contained in:
Dominik Ermel 2020-10-01 14:19:18 +00:00 • committed by Carles Cufí
commit d795f2dbfe
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/fs/fs.h
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2016 Intel Corporation. * Copyright (c) 2016 Intel Corporation.
* Copyright (c) 2020 Nordic Semiconductor ASA
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -320,7 +321,8 @@ ssize_t fs_write(struct fs_file_t *zfp, const void *ptr, size_t size);
* - FS_SEEK_END = from end of file. * - FS_SEEK_END = from end of file.
* *
* @retval 0 Success * @retval 0 Success
* @retval -ERRNO errno code if error. * @retval -ENOTSUP if underlying file system does not support seeking
* @retval < 0 negative errno code
*/ */
int fs_seek(struct fs_file_t *zfp, off_t offset, int whence); int fs_seek(struct fs_file_t *zfp, off_t offset, int whence);
@ -331,7 +333,9 @@ int fs_seek(struct fs_file_t *zfp, off_t offset, int whence);
* *
* @param zfp Pointer to the file object * @param zfp Pointer to the file object
* *
* @retval position Current position in file * @retval >= 0 position Current position in file
* @retval -ENOTSUP if underlying file system does not support seeking
* @retval < 0 negative errno code
* Current revision does not validate the file object. * Current revision does not validate the file object.
*/ */
off_t fs_tell(struct fs_file_t *zfp); off_t fs_tell(struct fs_file_t *zfp);

5
subsys/fs/fs.c
View file

@ -1,6 +1,7 @@
/* /*
* Copyright (c) 2018 Intel Corporation. * Copyright (c) 2018 Intel Corporation.
* Copyright (c) 2020 Peter Bigot Consulting, LLC * Copyright (c) 2020 Peter Bigot Consulting, LLC
* Copyright (c) 2020 Nordic Semiconductor ASA
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -218,7 +219,7 @@ ssize_t fs_write(struct fs_file_t *zfp, const void *ptr, size_t size)
int fs_seek(struct fs_file_t *zfp, off_t offset, int whence) int fs_seek(struct fs_file_t *zfp, off_t offset, int whence)
{ {
int rc = -EINVAL; int rc = -ENOTSUP;
if (zfp->mp == NULL) { if (zfp->mp == NULL) {
return -EBADF; return -EBADF;
@ -236,7 +237,7 @@ int fs_seek(struct fs_file_t *zfp, off_t offset, int whence)
off_t fs_tell(struct fs_file_t *zfp) off_t fs_tell(struct fs_file_t *zfp)
{ {
int rc = -EINVAL; int rc = -ENOTSUP;
if (zfp->mp == NULL) { if (zfp->mp == NULL) {
return -EBADF; return -EBADF;