diff --git a/examples/tlpi/Makefile b/examples/tlpi/Makefile index 519c93d31..11999aba6 100644 --- a/examples/tlpi/Makefile +++ b/examples/tlpi/Makefile @@ -124,7 +124,7 @@ MAINSRC += $(TLPIDIR)/dirs_links/file_type_stats.c \ $(TLPIDIR)/dirs_links/nftw_dir_tree.c \ $(TLPIDIR)/dirs_links/t_unlink.c \ $(TLPIDIR)/dirs_links/t_dirbasename.c -ifneq ($(CONFIG_PSEUDOFS_SOFTLINKS),) +ifneq ($(CONFIG_FS_LINKS),) MAINSRC += $(TLPIDIR)/dirs_links/bad_symlink.c \ $(TLPIDIR)/dirs_links/view_symlink.c endif diff --git a/interpreters/luamodules/luv/Kconfig b/interpreters/luamodules/luv/Kconfig index 490f83adf..f9eb2b4ef 100644 --- a/interpreters/luamodules/luv/Kconfig +++ b/interpreters/luamodules/luv/Kconfig @@ -14,7 +14,7 @@ config LUA_LUV_MODULE depends on NET_SOCKOPTS depends on NET_TCP depends on NET_UDP - depends on PSEUDOFS_SOFTLINKS + depends on FS_LINKS depends on SCHED_HAVE_PARENT ---help--- Bare libuv bindings for Lua diff --git a/interpreters/wamr/Kconfig b/interpreters/wamr/Kconfig index 3811d5381..4ec5a0732 100644 --- a/interpreters/wamr/Kconfig +++ b/interpreters/wamr/Kconfig @@ -108,7 +108,7 @@ config INTERPRETERS_WAMR_BUILD_MODULES_FOR_NUTTX config INTERPRETERS_WAMR_LIBC_WASI bool "Enable WASI libc" - select PSEUDOFS_SOFTLINKS + select FS_LINKS default n ---help--- Note: As of writing this, this works only with main branch of diff --git a/nshlib/Kconfig b/nshlib/Kconfig index 0de85924b..8f1740a18 100644 --- a/nshlib/Kconfig +++ b/nshlib/Kconfig @@ -509,7 +509,7 @@ config NSH_DISABLE_LOMTD config NSH_DISABLE_LN bool "Disable ln" default DEFAULT_SMALL - depends on PSEUDOFS_SOFTLINKS + depends on FS_LINKS config NSH_DISABLE_LS bool "Disable ls" @@ -636,7 +636,7 @@ config NSH_DISABLE_PWD config NSH_DISABLE_READLINK bool "Disable readlink" default DEFAULT_SMALL - depends on PSEUDOFS_SOFTLINKS + depends on FS_LINKS config NSH_DISABLE_SWITCHBOOT bool "Switch boot partition" diff --git a/nshlib/nsh.h b/nshlib/nsh.h index 4183fab55..9ac148b94 100644 --- a/nshlib/nsh.h +++ b/nshlib/nsh.h @@ -992,7 +992,7 @@ int cmd_irqinfo(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv); #ifndef CONFIG_NSH_DISABLE_HEXDUMP int cmd_hexdump(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv); #endif -#if !defined(CONFIG_NSH_DISABLE_LN) && defined(CONFIG_PSEUDOFS_SOFTLINKS) +#if !defined(CONFIG_NSH_DISABLE_LN) && defined(CONFIG_FS_LINKS) int cmd_ln(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv); #endif #ifndef CONFIG_NSH_DISABLE_LS @@ -1004,7 +1004,7 @@ int cmd_irqinfo(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv); #if defined(CONFIG_SYSLOG_DEVPATH) && !defined(CONFIG_NSH_DISABLE_DMESG) int cmd_dmesg(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv); #endif -#if !defined(CONFIG_NSH_DISABLE_READLINK) && defined(CONFIG_PSEUDOFS_SOFTLINKS) +#if !defined(CONFIG_NSH_DISABLE_READLINK) && defined(CONFIG_FS_LINKS) int cmd_readlink(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv); #endif #if !defined(CONFIG_NSH_DISABLESCRIPT) && !defined(CONFIG_NSH_DISABLE_SOURCE) diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c index 22e43b4f4..14a375ebc 100644 --- a/nshlib/nsh_command.c +++ b/nshlib/nsh_command.c @@ -351,7 +351,7 @@ static const struct cmdmap_s g_cmdmap[] = # endif #endif -#if !defined(CONFIG_NSH_DISABLE_LN) && defined(CONFIG_PSEUDOFS_SOFTLINKS) +#if !defined(CONFIG_NSH_DISABLE_LN) && defined(CONFIG_FS_LINKS) CMD_MAP("ln", cmd_ln, 3, 4, "[-s] "), #endif @@ -508,7 +508,7 @@ static const struct cmdmap_s g_cmdmap[] = CMD_MAP("pwd", cmd_pwd, 1, 1, NULL), #endif -#if !defined(CONFIG_NSH_DISABLE_READLINK) && defined(CONFIG_PSEUDOFS_SOFTLINKS) +#if !defined(CONFIG_NSH_DISABLE_READLINK) && defined(CONFIG_FS_LINKS) CMD_MAP("readlink", cmd_readlink, 2, 2, ""), #endif diff --git a/nshlib/nsh_fscmds.c b/nshlib/nsh_fscmds.c index 0a6fd945f..c368c904c 100644 --- a/nshlib/nsh_fscmds.c +++ b/nshlib/nsh_fscmds.c @@ -397,7 +397,7 @@ static int ls_handler(FAR struct nsh_vtbl_s *vtbl, FAR const char *dirpath, FAR struct dirent *entryp, FAR void *pvarg) { unsigned int lsflags = (unsigned int)((uintptr_t)pvarg); -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS bool isdir = false; #endif int ret; @@ -435,7 +435,7 @@ static int ls_handler(FAR struct nsh_vtbl_s *vtbl, FAR const char *dirpath, { char details[] = "----------"; -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS if (S_ISLNK(buf.st_mode)) { details[0] = 'l'; /* Takes precedence over type of the target */ @@ -621,7 +621,7 @@ static int ls_handler(FAR struct nsh_vtbl_s *vtbl, FAR const char *dirpath, { nsh_output(vtbl, " %s", entryp->d_name); -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS if (DIRENT_ISLINK(entryp->d_type)) { FAR char *fullpath; @@ -1660,7 +1660,7 @@ errout_with_paths: * Name: cmd_ln ****************************************************************************/ -#if !defined(CONFIG_NSH_DISABLE_LN) && defined(CONFIG_PSEUDOFS_SOFTLINKS) +#if !defined(CONFIG_NSH_DISABLE_LN) && defined(CONFIG_FS_LINKS) int cmd_ln(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv) { FAR char *linkpath; @@ -2528,7 +2528,7 @@ errout_with_oldpath: * Name: cmd_readlink ****************************************************************************/ -#if !defined(CONFIG_NSH_DISABLE_READLINK) && defined(CONFIG_PSEUDOFS_SOFTLINKS) +#if !defined(CONFIG_NSH_DISABLE_READLINK) && defined(CONFIG_FS_LINKS) int cmd_readlink(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv) { UNUSED(argc); diff --git a/system/adb/Kconfig b/system/adb/Kconfig index a97ac5a9f..451c7b322 100644 --- a/system/adb/Kconfig +++ b/system/adb/Kconfig @@ -164,8 +164,8 @@ config ADBD_FILE_SERVICE config ADBD_FILE_SYMLINK bool "File service symlink support" depends on ADBD_FILE_SERVICE - depends on PSEUDOFS_SOFTLINKS - default PSEUDOFS_SOFTLINKS + depends on FS_LINKS + default FS_LINKS ---help--- Enable fs symlink support. diff --git a/testing/testsuites/Kconfig b/testing/testsuites/Kconfig index eb2cd4547..5c909505e 100644 --- a/testing/testsuites/Kconfig +++ b/testing/testsuites/Kconfig @@ -29,7 +29,7 @@ config TESTS_TESTSUITES_STACKSIZE config CM_FS_TEST bool "enable fs test" default n - depends on PSEUDOFS_SOFTLINKS + depends on FS_LINKS config CM_SCHED_TEST bool "enable schedule test" @@ -56,7 +56,7 @@ config CM_SOCKET_TEST config CM_SYSCALL_TEST bool "enable syscall test" default n - depends on PIPES && SCHED_HAVE_PARENT && FS_TMPFS && ARCH_SETJMP_H && PSEUDOFS_SOFTLINKS + depends on PIPES && SCHED_HAVE_PARENT && FS_TMPFS && ARCH_SETJMP_H && FS_LINKS config CM_MUTEX_TEST bool "enable mutex test"