Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-08-27 20:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fs: rename PSEUDOFS_SOFTLINKS to FS_LINKS

Browse source 
The link support is no longer limited to the pseudo file system and now
covers both soft (symbolic) links and hard links across the VFS.  Update
all references to the renamed configuration option PSEUDOFS_SOFTLINKS,
which has been renamed to FS_LINKS in the NuttX kernel, so that nshlib,
the interpreters, adb, tlpi and the test suites keep building.

This must be merged together with the corresponding NuttX change that
performs the actual kernel-side rename.

Signed-off-by: zhengyu16 <zhengyu16@xiaomi.com>
This commit is contained in:
zhengyu16 2026-08-25 16:30:03 +08:00 • committed by Xiang Xiao
parent 94012303da
commit 9cda1fbb60
9 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/tlpi/Makefile
View file

@ -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

2
interpreters/luamodules/luv/Kconfig
View file

@ -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

2
interpreters/wamr/Kconfig
View file

@ -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

4
nshlib/Kconfig
View file

@ -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"

4
nshlib/nsh.h
View file

@ -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)

4
nshlib/nsh_command.c
View file

@ -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] <target> <link>"),
#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, "<link>"),
#endif

10
nshlib/nsh_fscmds.c
View file

@ -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);

4
system/adb/Kconfig
View file

@ -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.

4
testing/testsuites/Kconfig
View file

@ -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"