[v1] Start porting UML to nolibc

[PATCH 4/9] tools/nolibc/dirent: avoid errno in readdir_r

Posted by Benjamin Berg 2 weeks, 3 days ago

From: Benjamin Berg <benjamin.berg@intel.com>

Using errno is not possible when NOLIBC_IGNORE_ERRNO is set. Use
sys_lseek instead of lseek as that avoids using errno.

Fixes: 665fa8dea90d ("tools/nolibc: add support for directory access")
Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
---
 tools/include/nolibc/dirent.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/include/nolibc/dirent.h b/tools/include/nolibc/dirent.h
index 758b95c48e7a..61a122a60327 100644
--- a/tools/include/nolibc/dirent.h
+++ b/tools/include/nolibc/dirent.h
@@ -86,9 +86,9 @@ int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
 	 * readdir() can only return one entry at a time.
 	 * Make sure the non-returned ones are not skipped.
 	 */
-	ret = lseek(fd, ldir->d_off, SEEK_SET);
-	if (ret == -1)
-		return errno;
+	ret = sys_lseek(fd, ldir->d_off, SEEK_SET);
+	if (ret < 0)
+		return -ret;
 
 	entry->d_ino = ldir->d_ino;
 	/* the destination should always be big enough */
-- 
2.51.0

Re: [PATCH 4/9] tools/nolibc/dirent: avoid errno in readdir_r

Posted by Thomas Weißschuh 2 weeks, 3 days ago

On 2025-09-15 09:11:10+0200, Benjamin Berg wrote:
> From: Benjamin Berg <benjamin.berg@intel.com>
> 
> Using errno is not possible when NOLIBC_IGNORE_ERRNO is set. Use
> sys_lseek instead of lseek as that avoids using errno.
> 
> Fixes: 665fa8dea90d ("tools/nolibc: add support for directory access")
> Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>

Acked-by: Thomas Weißschuh <linux@weissschuh.net>

> ---
>  tools/include/nolibc/dirent.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/include/nolibc/dirent.h b/tools/include/nolibc/dirent.h
> index 758b95c48e7a..61a122a60327 100644
> --- a/tools/include/nolibc/dirent.h
> +++ b/tools/include/nolibc/dirent.h
> @@ -86,9 +86,9 @@ int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
>  	 * readdir() can only return one entry at a time.
>  	 * Make sure the non-returned ones are not skipped.
>  	 */
> -	ret = lseek(fd, ldir->d_off, SEEK_SET);
> -	if (ret == -1)
> -		return errno;
> +	ret = sys_lseek(fd, ldir->d_off, SEEK_SET);
> +	if (ret < 0)
> +		return -ret;
>  
>  	entry->d_ino = ldir->d_ino;
>  	/* the destination should always be big enough */
> -- 
> 2.51.0
>