Jelajahi Sumber

!288 测试sqlite时,进行获取绝对路径出错
Merge pull request !288 from lin123/rt-smart

bernard 4 tahun lalu
induk
melakukan
f327d83fd0

+ 5 - 1
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,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;
 }

+ 6 - 4
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,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)
@@ -3791,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,