From d858a5e99f749a9bd41af9af1f035db8291ed552 Mon Sep 17 00:00:00 2001 From: "@lin12345678" Date: Mon, 9 Aug 2021 14:27:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9C=A8=E8=BF=9B=E8=A1=8Csqlite=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=B5=8B=E8=AF=95=E6=97=B6=EF=BC=8C=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E8=8E=B7=E5=8F=96=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/dfs/filesystems/elmfat/dfs_elm.c | 4 ++++ components/lwp/lwp_syscall.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/components/dfs/filesystems/elmfat/dfs_elm.c b/components/dfs/filesystems/elmfat/dfs_elm.c index 4df1663261..e0cd63e6df 100644 --- a/components/dfs/filesystems/elmfat/dfs_elm.c +++ b/components/dfs/filesystems/elmfat/dfs_elm.c @@ -551,6 +551,10 @@ int dfs_elm_ioctl(struct dfs_fd *file, int cmd, void *args) fd->fptr = fptr; return elm_result_to_dfs(result); } + case F_GETLK: + return 0; + case F_SETLK: + return 0; } return -ENOSYS; } diff --git a/components/lwp/lwp_syscall.c b/components/lwp/lwp_syscall.c index 81dae58dfd..8adefa5d8d 100644 --- a/components/lwp/lwp_syscall.c +++ b/components/lwp/lwp_syscall.c @@ -3262,7 +3262,9 @@ char *sys_getcwd(char *buf, size_t size) return RT_NULL; } #endif - return getcwd(buf, size); + getcwd(buf, size); + + return (char *)strlen(buf); } int sys_chdir(const char *path) -- Gitee From 1caf6fa58cc3d62e3be672c561d0b4c222208554 Mon Sep 17 00:00:00 2001 From: "@lin12345678" Date: Mon, 9 Aug 2021 14:31:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/dfs/filesystems/elmfat/dfs_elm.c | 4 ++-- components/lwp/lwp_syscall.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/dfs/filesystems/elmfat/dfs_elm.c b/components/dfs/filesystems/elmfat/dfs_elm.c index e0cd63e6df..c7f19293bf 100644 --- a/components/dfs/filesystems/elmfat/dfs_elm.c +++ b/components/dfs/filesystems/elmfat/dfs_elm.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2018, RT-Thread Development Team + * Copyright (c) 2006-2021, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -551,7 +551,7 @@ int dfs_elm_ioctl(struct dfs_fd *file, int cmd, void *args) fd->fptr = fptr; return elm_result_to_dfs(result); } - case F_GETLK: + case F_GETLK: return 0; case F_SETLK: return 0; diff --git a/components/lwp/lwp_syscall.c b/components/lwp/lwp_syscall.c index 8adefa5d8d..31c66c9bd8 100644 --- a/components/lwp/lwp_syscall.c +++ b/components/lwp/lwp_syscall.c @@ -3158,7 +3158,7 @@ int sys_gethostbyname2_r(const char *name, int af, struct hostent *ret, int a_err = 0; #ifdef RT_USING_USERSPACE - if (!lwp_user_accessable((void *)err, sizeof(*err))) + if (!lwp_user_accessable((void *)err, sizeof(*err))) { rt_set_errno(EFAULT); goto __exit; @@ -3166,7 +3166,7 @@ int sys_gethostbyname2_r(const char *name, int af, struct hostent *ret, if (!lwp_user_accessable((void *)result, sizeof(*result)) || !lwp_user_accessable((void *)ret, sizeof(*ret)) - || !lwp_user_accessable((void *)buf, buflen)) + || !lwp_user_accessable((void *)buf, buflen)) { /* not all arguments given */ *err = EFAULT; @@ -3262,7 +3262,7 @@ char *sys_getcwd(char *buf, size_t size) return RT_NULL; } #endif - getcwd(buf, size); + getcwd(buf, size); return (char *)strlen(buf); } @@ -3793,7 +3793,7 @@ const static void* func_table[] = (void *)sys_pmutex, (void *)sys_dup, (void *)sys_dup2, - (void *)sys_rename, /* 135 */ + (void *)sys_rename, /* 135 */ (void *)sys_fork, (void *)sys_execve, (void *)sys_vfork, -- Gitee