diff --git a/Documentation/applications/nsh/config.rst b/Documentation/applications/nsh/config.rst index d40227f35af..19b92ebfe03 100644 --- a/Documentation/applications/nsh/config.rst +++ b/Documentation/applications/nsh/config.rst @@ -73,7 +73,7 @@ Command Depends on Configuration Can Be Disabl :ref:`cmdkill` ``CONFIG_NSH_DISABLE_KILL`` . :ref:`cmdlosetup` ! ``CONFIG_DISABLE_MOUNTPOINT`` && ``CONFIG_NSH_DISABLE_LOSETUP`` ``CONFIG_DEV_LOOP`` -:ref:`cmdln` ``CONFIG_PSEUDOFS_SOFTLINKS`` ``CONFIG_NSH_DISABLE_LN`` +:ref:`cmdln` ``CONFIG_FS_LINKS`` ``CONFIG_NSH_DISABLE_LN`` :ref:`cmdls` ``CONFIG_NSH_DISABLE_LS`` . :ref:`cmdlsmod` ``CONFIG_MODULE`` && ``CONFIG_FS_PROCFS`` ``CONFIG_NSH_DISABLE_MODCMDS`` && |br| @@ -106,7 +106,7 @@ Command Depends on Configuration Can Be Disabl :ref:`cmdput` ``CONFIG_NET`` && ``CONFIG_NET_UDP`` && ``CONFIG_NSH_DISABLE_PUT`` ``MTU >= 558`` [#1]_, [#2]_ :ref:`cmdpwd` ! ``CONFIG_DISABLE_ENVIRON`` ``CONFIG_NSH_DISABLE_PWD`` -:ref:`cmdreadlink` ``CONFIG_PSEUDOFS_SOFTLINKS`` ``CONFIG_NSH_DISABLE_READLINK`` +:ref:`cmdreadlink` ``CONFIG_FS_LINKS`` ``CONFIG_NSH_DISABLE_READLINK`` :ref:`cmdreboot` ``CONFIG_BOARD_RESET`` ``CONFIG_NSH_DISABLE_REBOOT`` :ref:`cmdrm` ! ``CONFIG_DISABLE_MOUNTPOINT`` \|\| ``CONFIG_NSH_DISABLE_RM`` ! ``CONFIG_DISABLE_PSEUDOFS_OPERATIONS`` diff --git a/Documentation/reference/user/10_filesystem.rst b/Documentation/reference/user/10_filesystem.rst index 4ad5cb43039..695c1e0db30 100644 --- a/Documentation/reference/user/10_filesystem.rst +++ b/Documentation/reference/user/10_filesystem.rst @@ -227,7 +227,7 @@ UNIX Standard Operations (``unistd.h``) int rmdir(FAR const char *pathname); int unlink(FAR const char *pathname); - #ifdef CONFIG_PSEUDOFS_SOFTLINKS + #ifdef CONFIG_FS_LINKS int link(FAR const char *path1, FAR const char *path2); ssize_t readlink(FAR const char *path, FAR char *buf, size_t bufsize); #endif diff --git a/Documentation/standards/posix.rst b/Documentation/standards/posix.rst index 47622ec7921..5333f6f11e7 100644 --- a/Documentation/standards/posix.rst +++ b/Documentation/standards/posix.rst @@ -225,7 +225,7 @@ Units of Functionality Requirements: +------------------------------+---------+--------------------------------+ | `POSIX_STRING_MATCHING`_ | Yes | | +------------------------------+---------+--------------------------------+ -| `POSIX_SYMBOLIC_LINKS`_ | Yes | ``CONFIG_PSEUDOFS_SOFTLINKS`` | +| `POSIX_SYMBOLIC_LINKS`_ | Yes | ``CONFIG_FS_LINKS`` | +------------------------------+---------+--------------------------------+ | `POSIX_SYSTEM_DATABASE`_ | Yes | | +------------------------------+---------+--------------------------------+ diff --git a/boards/arm/am67/t3-gem-o1/configs/nsh/defconfig b/boards/arm/am67/t3-gem-o1/configs/nsh/defconfig index 3bf01e87314..fb7b0717470 100644 --- a/boards/arm/am67/t3-gem-o1/configs/nsh/defconfig +++ b/boards/arm/am67/t3-gem-o1/configs/nsh/defconfig @@ -26,6 +26,7 @@ CONFIG_ARM_MPU=y CONFIG_BOARD_LOOPSPERMSEC=2813 CONFIG_BOOT_RUNFROMISRAM=y CONFIG_BUILTIN=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y @@ -35,7 +36,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PSEUDOFS_ATTRIBUTES=y CONFIG_PSEUDOFS_FILE=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_RAM_SIZE=14680064 CONFIG_RAM_START=0xA2200000 CONFIG_READLINE_CMD_HISTORY=y diff --git a/boards/arm/imx6/sabre-6quad/configs/citest/defconfig b/boards/arm/imx6/sabre-6quad/configs/citest/defconfig index 05b5b8b0e00..daceae1df4b 100644 --- a/boards/arm/imx6/sabre-6quad/configs/citest/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/citest/defconfig @@ -32,6 +32,7 @@ CONFIG_EXAMPLES_PIPE=y CONFIG_EXAMPLES_POPEN=y CONFIG_EXAMPLES_USRSOCKTEST=y CONFIG_EXPERIMENTAL=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_TMPFS=y CONFIG_HAVE_CXX=y @@ -48,7 +49,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_RAM_SIZE=1073741824 CONFIG_RAM_START=0x10000000 CONFIG_RAM_VSTART=0x10000000 diff --git a/boards/arm/imx6/sabre-6quad/configs/netknsh/defconfig b/boards/arm/imx6/sabre-6quad/configs/netknsh/defconfig index 5cad237fb1f..a856df862df 100644 --- a/boards/arm/imx6/sabre-6quad/configs/netknsh/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/netknsh/defconfig @@ -42,6 +42,7 @@ CONFIG_ELF_STACKSIZE=3072 CONFIG_ETH0_PHY_KSZ8081=y CONFIG_EXAMPLES_HELLO=m CONFIG_FS_HOSTFS=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y @@ -92,7 +93,6 @@ CONFIG_NSH_FILE_APPS=y CONFIG_NSH_READLINE=y CONFIG_PATH_INITIAL="/system/bin" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_RAM_SIZE=1073741824 CONFIG_RAM_START=0x10000000 CONFIG_RAM_VSTART=0x10000000 diff --git a/boards/arm/imx6/sabre-6quad/configs/netknsh_smp/defconfig b/boards/arm/imx6/sabre-6quad/configs/netknsh_smp/defconfig index 2e2b708b21c..1812e9210d0 100644 --- a/boards/arm/imx6/sabre-6quad/configs/netknsh_smp/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/netknsh_smp/defconfig @@ -42,6 +42,7 @@ CONFIG_ELF_STACKSIZE=3072 CONFIG_ETH0_PHY_KSZ8081=y CONFIG_EXAMPLES_HELLO=m CONFIG_FS_HOSTFS=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y @@ -92,7 +93,6 @@ CONFIG_NSH_FILE_APPS=y CONFIG_NSH_READLINE=y CONFIG_PATH_INITIAL="/system/bin" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_RAM_SIZE=1073741824 CONFIG_RAM_START=0x10000000 CONFIG_RAM_VSTART=0x10000000 diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/pico-restouch-lcd-2.8/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/pico-restouch-lcd-2.8/defconfig index 77d12f43ccf..611d532cc60 100644 --- a/boards/arm/rp2040/raspberrypi-pico/configs/pico-restouch-lcd-2.8/defconfig +++ b/boards/arm/rp2040/raspberrypi-pico/configs/pico-restouch-lcd-2.8/defconfig @@ -50,6 +50,7 @@ CONFIG_EXAMPLES_NXLINES_BPP=16 CONFIG_EXAMPLES_NXLINES_CIRCLECOLOR=0xf7bb CONFIG_EXAMPLES_NXLINES_LINECOLOR=0xffe0 CONFIG_EXAMPLES_NX_BPP=16 +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_ROMFS=y @@ -75,7 +76,6 @@ CONFIG_NXFONT_SANS40X49B=y CONFIG_NX_BLOCKING=y CONFIG_PSEUDOFS_ATTRIBUTES=y CONFIG_PSEUDOFS_FILE=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_RAMLOG=y CONFIG_RAMLOG_SYSLOG=y CONFIG_RAM_SIZE=270336 diff --git a/boards/arm/stm32f4/stm32f4discovery/configs/toybox/defconfig b/boards/arm/stm32f4/stm32f4discovery/configs/toybox/defconfig index d8fad21601d..f40428bde5d 100644 --- a/boards/arm/stm32f4/stm32f4discovery/configs/toybox/defconfig +++ b/boards/arm/stm32f4/stm32f4discovery/configs/toybox/defconfig @@ -19,6 +19,7 @@ CONFIG_ARCH_SETJMP_H=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_EXAMPLES_HELLO=y +CONFIG_FS_LINKS=y CONFIG_FS_NOTIFY=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y @@ -33,7 +34,6 @@ CONFIG_LINE_MAX=64 CONFIG_MM_REGIONS=2 CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32h7/portenta-h7/configs/jumbo_cm7/defconfig b/boards/arm/stm32h7/portenta-h7/configs/jumbo_cm7/defconfig index f324baba7d7..d8ae7b7ab02 100644 --- a/boards/arm/stm32h7/portenta-h7/configs/jumbo_cm7/defconfig +++ b/boards/arm/stm32h7/portenta-h7/configs/jumbo_cm7/defconfig @@ -26,6 +26,7 @@ CONFIG_DEBUG_ASSERTIONS_EXPRESSION=y CONFIG_DEBUG_FEATURES=y CONFIG_DEBUG_SYMBOLS=y CONFIG_EVENT_FD=y +CONFIG_FS_LINKS=y CONFIG_FS_NOTIFY=y CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y @@ -47,7 +48,6 @@ CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 CONFIG_PSEUDOFS_ATTRIBUTES=y CONFIG_PSEUDOFS_FILE=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_RAM_SIZE=245760 CONFIG_RAM_START=0x20010000 CONFIG_RAW_BINARY=y diff --git a/boards/arm64/imx9/imx93-evk/configs/knsh/defconfig b/boards/arm64/imx9/imx93-evk/configs/knsh/defconfig index eb90f69198d..4cd8d91e97a 100644 --- a/boards/arm64/imx9/imx93-evk/configs/knsh/defconfig +++ b/boards/arm64/imx9/imx93-evk/configs/knsh/defconfig @@ -54,6 +54,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_FAT_DMAMEMORY=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_GPT_PARTITION=y @@ -127,7 +128,6 @@ CONFIG_NSH_STRERROR=y CONFIG_NSH_VARS=y CONFIG_PATH_INITIAL="/bin" CONFIG_PRIORITY_INHERITANCE=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PTHREAD_STACK_MIN=1024 CONFIG_PWM=y CONFIG_PWM_NCHANNELS=4 diff --git a/boards/arm64/imx9/imx93-evk/configs/koptee/defconfig b/boards/arm64/imx9/imx93-evk/configs/koptee/defconfig index 18a8e405efb..7b056ffd1de 100644 --- a/boards/arm64/imx9/imx93-evk/configs/koptee/defconfig +++ b/boards/arm64/imx9/imx93-evk/configs/koptee/defconfig @@ -58,6 +58,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_FAT_DMAMEMORY=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_FS_SHMFS=y @@ -132,7 +133,6 @@ CONFIG_NSH_STRERROR=y CONFIG_NSH_VARS=y CONFIG_PATH_INITIAL="/bin" CONFIG_PRIORITY_INHERITANCE=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PTHREAD_STACK_MIN=1024 CONFIG_PWM=y CONFIG_PWM_NCHANNELS=4 diff --git a/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/python/defconfig b/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/python/defconfig index fd91f3d5dfe..09fe3e5ffa4 100644 --- a/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/python/defconfig +++ b/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/python/defconfig @@ -49,6 +49,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_FS_HEAPBUF_SECTION=".ext_ram.bss.buf" CONFIG_FS_HEAPSIZE=2097152 CONFIG_FS_LARGEFILE=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_FS_TMPFS=y @@ -93,7 +94,6 @@ CONFIG_NSH_STRERROR=y CONFIG_ONESHOT=y CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=0 -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_RR_INTERVAL=200 CONFIG_SCHED_BACKTRACE=y CONFIG_SMARTFS_MAXNAMLEN=48 diff --git a/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/webpanel/defconfig b/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/webpanel/defconfig index 4c90b61be34..4c3c1d851da 100644 --- a/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/webpanel/defconfig +++ b/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/webpanel/defconfig @@ -56,6 +56,7 @@ CONFIG_FS_BINFS=y CONFIG_FS_HEAPBUF_SECTION=".ext_ram.bss.buf" CONFIG_FS_HEAPSIZE=2097152 CONFIG_FS_LARGEFILE=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_FS_TMPFS=y @@ -110,7 +111,6 @@ CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y CONFIG_ONESHOT=y CONFIG_PREALLOC_TIMERS=0 -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PSEUDOTERM=y CONFIG_RR_INTERVAL=200 CONFIG_SCHED_BACKTRACE=y diff --git a/boards/risc-v/esp32p4/esp32p4-tab5/configs/python/defconfig b/boards/risc-v/esp32p4/esp32p4-tab5/configs/python/defconfig index 53ecaad3140..601d3027191 100644 --- a/boards/risc-v/esp32p4/esp32p4-tab5/configs/python/defconfig +++ b/boards/risc-v/esp32p4/esp32p4-tab5/configs/python/defconfig @@ -46,6 +46,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_FS_HEAPBUF_SECTION=".ext_ram.bss.buf" CONFIG_FS_HEAPSIZE=2097152 CONFIG_FS_LARGEFILE=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_FS_TMPFS=y @@ -77,7 +78,6 @@ CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=0 -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_RR_INTERVAL=200 CONFIG_SCHED_BACKTRACE=y CONFIG_SCHED_WORKQUEUE=y diff --git a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig b/boards/risc-v/mpfs/icicle/configs/knsh/defconfig index 069db7380ac..a4950cf0343 100644 --- a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/knsh/defconfig @@ -49,6 +49,7 @@ CONFIG_DEFAULT_TASK_STACKSIZE=4096 CONFIG_ELF=y CONFIG_EXAMPLES_HELLO=y CONFIG_EXPERIMENTAL=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_EXCLUDE_ENVIRON=y CONFIG_FS_ROMFS=y @@ -81,7 +82,6 @@ CONFIG_NUTTSBI_IPI_BASE=0x02000000 CONFIG_NUTTSBI_MTIMECMP_BASE=0x02004000 CONFIG_NUTTSBI_MTIME_BASE=0x0200bff8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_RAM_SIZE=2097152 CONFIG_RAM_START=0x80200000 CONFIG_RAW_BINARY=y diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/citest/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/citest/defconfig index 4c02d991ce6..d9ccaeaee41 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/citest/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/citest/defconfig @@ -60,6 +60,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_AIO=y CONFIG_FS_FAT=y CONFIG_FS_HOSTFS=y +CONFIG_FS_LINKS=y CONFIG_FS_NAMED_SEMAPHORES=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y @@ -96,7 +97,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PATH_INITIAL="/system/bin" CONFIG_PREALLOC_TIMERS=0 -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PTHREAD_SPINLOCKS=y CONFIG_PTHREAD_STACK_MIN=2048 CONFIG_RAM_SIZE=33554432 diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/citest64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/citest64/defconfig index 90c9cb6b482..4408b55cc3d 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/citest64/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/citest64/defconfig @@ -39,6 +39,7 @@ CONFIG_EXAMPLES_PIPE=y CONFIG_EXAMPLES_POPEN=y CONFIG_EXAMPLES_USRSOCKTEST=y CONFIG_FS_HOSTFS=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_TMPFS=y CONFIG_HAVE_CXX=y @@ -62,7 +63,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PATH_INITIAL="/system/bin" CONFIG_PREALLOC_TIMERS=0 -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_RAM_SIZE=33554432 CONFIG_RAM_START=0x80000000 CONFIG_READLINE_CMD_HISTORY=y diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/python/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/python/defconfig index 4a467c3eab5..3040231a60f 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/python/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/python/defconfig @@ -56,6 +56,7 @@ CONFIG_FRAME_POINTER=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y CONFIG_FS_HOSTFS=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_FS_TMPFS=y @@ -112,7 +113,6 @@ CONFIG_NXPLAYER_HTTP_STREAMING_SUPPORT=y CONFIG_NXPLAYER_MAINTHREAD_STACKSIZE=3072 CONFIG_PATH_INITIAL="/system/bin" CONFIG_PIPES=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_RAM_SIZE=33554432 CONFIG_RAM_START=0x80000000 CONFIG_READLINE_CMD_HISTORY=y diff --git a/boards/sim/sim/sim/configs/adb/defconfig b/boards/sim/sim/sim/configs/adb/defconfig index e416bbdc30c..d09f4a1e8b6 100644 --- a/boards/sim/sim/sim/configs/adb/defconfig +++ b/boards/sim/sim/sim/configs/adb/defconfig @@ -30,6 +30,7 @@ CONFIG_ETC_ROMFS=y CONFIG_ETC_ROMFSDEVNO=1 CONFIG_FSUTILS_PASSWD=y CONFIG_FSUTILS_PASSWD_READONLY=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_FS_TMPFS=y @@ -55,7 +56,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_CONSOLE_LOGIN=y CONFIG_NSH_READLINE=y CONFIG_NSH_TELNET_LOGIN=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PSEUDOTERM=y CONFIG_RAMLOG=y CONFIG_RAMLOG_SYSLOG=y diff --git a/boards/sim/sim/sim/configs/baromonitor/defconfig b/boards/sim/sim/sim/configs/baromonitor/defconfig index 9a662cc409c..b01c7b3263e 100644 --- a/boards/sim/sim/sim/configs/baromonitor/defconfig +++ b/boards/sim/sim/sim/configs/baromonitor/defconfig @@ -37,6 +37,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y CONFIG_FS_HOSTFS=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -71,7 +72,6 @@ CONFIG_PATH_INITIAL="/bin" CONFIG_PIPES=y CONFIG_PSEUDOFS_ATTRIBUTES=y CONFIG_PSEUDOFS_FILE=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_RTC=y CONFIG_RTC_ARCH=y diff --git a/boards/sim/sim/sim/configs/citest/defconfig b/boards/sim/sim/sim/configs/citest/defconfig index 83f7008d23a..96f435aa996 100644 --- a/boards/sim/sim/sim/configs/citest/defconfig +++ b/boards/sim/sim/sim/configs/citest/defconfig @@ -55,6 +55,7 @@ CONFIG_FS_BACKTRACE=8 CONFIG_FS_BINFS=y CONFIG_FS_FAT=y CONFIG_FS_HOSTFS=y +CONFIG_FS_LINKS=y CONFIG_FS_NAMED_SEMAPHORES=y CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_PROFILER=y @@ -111,7 +112,6 @@ CONFIG_PATH_INITIAL="/bin" CONFIG_PM=y CONFIG_PM_RUNTIME=y CONFIG_PSEUDOFS_ATTRIBUTES=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PTHREAD_SPINLOCKS=y CONFIG_PTHREAD_STACK_MIN=2048 CONFIG_READLINE_TABCOMPLETION=y diff --git a/boards/sim/sim/sim/configs/crypto/defconfig b/boards/sim/sim/sim/configs/crypto/defconfig index f56bb4d5cfd..520fffa8e1c 100644 --- a/boards/sim/sim/sim/configs/crypto/defconfig +++ b/boards/sim/sim/sim/configs/crypto/defconfig @@ -37,6 +37,7 @@ CONFIG_FSUTILS_PASSWD=y CONFIG_FSUTILS_PASSWD_READONLY=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -60,7 +61,6 @@ CONFIG_MBEDTLS_SHA512_ALT=y CONFIG_NETUTILS_CODECS=y CONFIG_PATH_INITIAL="/bin" CONFIG_PSEUDOFS_ATTRIBUTES=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_SCHED_BACKTRACE=y CONFIG_SCHED_HAVE_PARENT=y diff --git a/boards/sim/sim/sim/configs/dropbear/defconfig b/boards/sim/sim/sim/configs/dropbear/defconfig index 0f151f46f81..fed9cf6f076 100644 --- a/boards/sim/sim/sim/configs/dropbear/defconfig +++ b/boards/sim/sim/sim/configs/dropbear/defconfig @@ -39,6 +39,7 @@ CONFIG_FSUTILS_PASSWD=y CONFIG_FSUTILS_PASSWD_PATH="/tmp/passwd" CONFIG_FS_BINFS=y CONFIG_FS_FAT=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -75,7 +76,6 @@ CONFIG_NSH_DROPBEAR=y CONFIG_NSH_FILE_APPS=y CONFIG_PATH_INITIAL="/bin" CONFIG_PSEUDOFS_ATTRIBUTES=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PSEUDOTERM=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_SCHED_BACKTRACE=y diff --git a/boards/sim/sim/sim/configs/login/defconfig b/boards/sim/sim/sim/configs/login/defconfig index 972b05ba1f2..94da7ca3d9e 100644 --- a/boards/sim/sim/sim/configs/login/defconfig +++ b/boards/sim/sim/sim/configs/login/defconfig @@ -37,6 +37,7 @@ CONFIG_FSUTILS_PASSWD=y CONFIG_FSUTILS_PASSWD_READONLY=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -61,7 +62,6 @@ CONFIG_NSH_MOTD_STRING="This is an example NuttX Message Of The Day (MOTD). Have CONFIG_NSH_READLINE=y CONFIG_PATH_INITIAL="/bin" CONFIG_PSEUDOFS_ATTRIBUTES=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_SCHED_BACKTRACE=y CONFIG_SCHED_HAVE_PARENT=y diff --git a/boards/sim/sim/sim/configs/lua/defconfig b/boards/sim/sim/sim/configs/lua/defconfig index b86a526165e..3a74b98aec6 100644 --- a/boards/sim/sim/sim/configs/lua/defconfig +++ b/boards/sim/sim/sim/configs/lua/defconfig @@ -31,6 +31,7 @@ CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -62,7 +63,6 @@ CONFIG_NSH_READLINE=y CONFIG_PATH_INITIAL="/bin" CONFIG_PIPES=y CONFIG_PSEUDOFS_ATTRIBUTES=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_CMD_HISTORY=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_SCHED_HAVE_PARENT=y diff --git a/boards/sim/sim/sim/configs/matter/defconfig b/boards/sim/sim/sim/configs/matter/defconfig index 479a97c231d..ceaadb24873 100644 --- a/boards/sim/sim/sim/configs/matter/defconfig +++ b/boards/sim/sim/sim/configs/matter/defconfig @@ -39,6 +39,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y CONFIG_FS_HOSTFS=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -102,7 +103,6 @@ CONFIG_NSH_MOTD_STRING="This is an example NuttX Message Of The Day (MOTD). Have CONFIG_NSH_READLINE=y CONFIG_PATH_INITIAL="/bin" CONFIG_PSEUDOFS_ATTRIBUTES=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_SCHED_BACKTRACE=y CONFIG_SCHED_HAVE_PARENT=y diff --git a/boards/sim/sim/sim/configs/minmea/defconfig b/boards/sim/sim/sim/configs/minmea/defconfig index 6f7136423cd..6f005a92dee 100644 --- a/boards/sim/sim/sim/configs/minmea/defconfig +++ b/boards/sim/sim/sim/configs/minmea/defconfig @@ -38,6 +38,7 @@ CONFIG_FSUTILS_PASSWD=y CONFIG_FSUTILS_PASSWD_READONLY=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -63,7 +64,6 @@ CONFIG_NSH_MOTD_STRING="This is an example NuttX Message Of The Day (MOTD). Have CONFIG_NSH_READLINE=y CONFIG_PATH_INITIAL="/bin" CONFIG_PSEUDOFS_ATTRIBUTES=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_SCHED_BACKTRACE=y CONFIG_SCHED_HAVE_PARENT=y diff --git a/boards/sim/sim/sim/configs/mnemofs/defconfig b/boards/sim/sim/sim/configs/mnemofs/defconfig index 60c1f2aff81..8b8b085be3c 100644 --- a/boards/sim/sim/sim/configs/mnemofs/defconfig +++ b/boards/sim/sim/sim/configs/mnemofs/defconfig @@ -38,6 +38,7 @@ CONFIG_FSUTILS_PASSWD=y CONFIG_FSUTILS_PASSWD_READONLY=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y +CONFIG_FS_LINKS=y CONFIG_FS_MNEMOFS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y @@ -71,7 +72,6 @@ CONFIG_NSH_MOTD_STRING="This is an example NuttX Message Of The Day (MOTD). Have CONFIG_NSH_READLINE=y CONFIG_PATH_INITIAL="/bin" CONFIG_PSEUDOFS_ATTRIBUTES=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_SCHED_BACKTRACE=y CONFIG_SCHED_HAVE_PARENT=y diff --git a/boards/sim/sim/sim/configs/nand/defconfig b/boards/sim/sim/sim/configs/nand/defconfig index 0d5c92df276..470e5308430 100644 --- a/boards/sim/sim/sim/configs/nand/defconfig +++ b/boards/sim/sim/sim/configs/nand/defconfig @@ -38,6 +38,7 @@ CONFIG_FSUTILS_PASSWD=y CONFIG_FSUTILS_PASSWD_READONLY=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -70,7 +71,6 @@ CONFIG_NSH_MOTD_STRING="This is an example NuttX Message Of The Day (MOTD). Have CONFIG_NSH_READLINE=y CONFIG_PATH_INITIAL="/bin" CONFIG_PSEUDOFS_ATTRIBUTES=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_SCHED_BACKTRACE=y CONFIG_SCHED_HAVE_PARENT=y diff --git a/boards/sim/sim/sim/configs/nsh/defconfig b/boards/sim/sim/sim/configs/nsh/defconfig index c28c4efe7fa..a54528e94a9 100644 --- a/boards/sim/sim/sim/configs/nsh/defconfig +++ b/boards/sim/sim/sim/configs/nsh/defconfig @@ -34,6 +34,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y CONFIG_FS_HOSTFS=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -58,7 +59,6 @@ CONFIG_PATH_INITIAL="/bin" CONFIG_PIPES=y CONFIG_PSEUDOFS_ATTRIBUTES=y CONFIG_PSEUDOFS_FILE=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_CMD_HISTORY=y CONFIG_READLINE_EDIT_EMACS=y CONFIG_READLINE_TABCOMPLETION=y diff --git a/boards/sim/sim/sim/configs/nsh2/defconfig b/boards/sim/sim/sim/configs/nsh2/defconfig index c44d9f32031..f9a8789e783 100644 --- a/boards/sim/sim/sim/configs/nsh2/defconfig +++ b/boards/sim/sim/sim/configs/nsh2/defconfig @@ -34,6 +34,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y CONFIG_FS_HOSTFS=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -58,7 +59,6 @@ CONFIG_PATH_INITIAL="/bin" CONFIG_PIPES=y CONFIG_PSEUDOFS_ATTRIBUTES=y CONFIG_PSEUDOFS_FILE=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_SCHED_BACKTRACE=y CONFIG_SCHED_EVENTS=y diff --git a/boards/sim/sim/sim/configs/nxcamera/defconfig b/boards/sim/sim/sim/configs/nxcamera/defconfig index f2e7ed1a790..4b0de453abd 100644 --- a/boards/sim/sim/sim/configs/nxcamera/defconfig +++ b/boards/sim/sim/sim/configs/nxcamera/defconfig @@ -30,6 +30,7 @@ CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -51,7 +52,6 @@ CONFIG_NSH_FILE_APPS=y CONFIG_NSH_READLINE=y CONFIG_PATH_INITIAL="/bin" CONFIG_PSEUDOFS_ATTRIBUTES=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_SCHED_BACKTRACE=y CONFIG_SCHED_HAVE_PARENT=y diff --git a/boards/sim/sim/sim/configs/nxdoom/defconfig b/boards/sim/sim/sim/configs/nxdoom/defconfig index f2daec575db..8c642b66a48 100644 --- a/boards/sim/sim/sim/configs/nxdoom/defconfig +++ b/boards/sim/sim/sim/configs/nxdoom/defconfig @@ -35,6 +35,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y CONFIG_FS_HOSTFS=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -63,7 +64,6 @@ CONFIG_PATH_INITIAL="/bin" CONFIG_PIPES=y CONFIG_PSEUDOFS_ATTRIBUTES=y CONFIG_PSEUDOFS_FILE=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_SCHED_BACKTRACE=y CONFIG_SCHED_EVENTS=y diff --git a/boards/sim/sim/sim/configs/nxmbrtu/defconfig b/boards/sim/sim/sim/configs/nxmbrtu/defconfig index d25881b23fd..d879e9d6265 100644 --- a/boards/sim/sim/sim/configs/nxmbrtu/defconfig +++ b/boards/sim/sim/sim/configs/nxmbrtu/defconfig @@ -22,6 +22,7 @@ CONFIG_DEBUG_SYMBOLS=y CONFIG_DEV_LOOP=y CONFIG_EXAMPLES_NXMBSERVER=y CONFIG_FS_BINFS=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=4096 @@ -40,7 +41,6 @@ CONFIG_PATH_INITIAL="/bin" CONFIG_PIPES=y CONFIG_PSEUDOFS_ATTRIBUTES=y CONFIG_PSEUDOFS_FILE=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_CMD_HISTORY=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_SCHED_BACKTRACE=y diff --git a/boards/sim/sim/sim/configs/posix_test/defconfig b/boards/sim/sim/sim/configs/posix_test/defconfig index fb0836dbc63..29267fceb3b 100644 --- a/boards/sim/sim/sim/configs/posix_test/defconfig +++ b/boards/sim/sim/sim/configs/posix_test/defconfig @@ -39,6 +39,7 @@ CONFIG_FS_AIO=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y CONFIG_FS_HOSTFS=y +CONFIG_FS_LINKS=y CONFIG_FS_NAMED_SEMAPHORES=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y @@ -72,7 +73,6 @@ CONFIG_NSH_READLINE=y CONFIG_PATH_INITIAL="/bin" CONFIG_PIPES=y CONFIG_PSEUDOFS_ATTRIBUTES=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_PTHREAD_SPINLOCKS=y CONFIG_READLINE_TABCOMPLETION=y diff --git a/boards/sim/sim/sim/configs/quickjs/defconfig b/boards/sim/sim/sim/configs/quickjs/defconfig index 74a01214741..a8e07f4a592 100644 --- a/boards/sim/sim/sim/configs/quickjs/defconfig +++ b/boards/sim/sim/sim/configs/quickjs/defconfig @@ -28,6 +28,7 @@ CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -54,7 +55,6 @@ CONFIG_PATH_INITIAL="/bin" CONFIG_PIPES=y CONFIG_PSEUDOFS_ATTRIBUTES=y CONFIG_PSEUDOFS_FILE=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_SCHED_BACKTRACE=y CONFIG_SCHED_EVENTS=y diff --git a/boards/sim/sim/sim/configs/rtptools/defconfig b/boards/sim/sim/sim/configs/rtptools/defconfig index 4e73f76b988..be7bd406614 100644 --- a/boards/sim/sim/sim/configs/rtptools/defconfig +++ b/boards/sim/sim/sim/configs/rtptools/defconfig @@ -24,6 +24,7 @@ CONFIG_EXAMPLES_TCPBLASTER=y CONFIG_EXAMPLES_TCPECHO=y CONFIG_FS_BINFS=y CONFIG_FS_HOSTFS=y +CONFIG_FS_LINKS=y CONFIG_FS_LITTLEFS=y CONFIG_FS_PROCFS=y CONFIG_FS_TMPFS=y @@ -79,7 +80,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILE_APPS=y CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PSEUDOTERM=y CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAMMTD=y diff --git a/boards/sim/sim/sim/configs/rust/defconfig b/boards/sim/sim/sim/configs/rust/defconfig index 5332d8bb60a..cb35a9b3506 100644 --- a/boards/sim/sim/sim/configs/rust/defconfig +++ b/boards/sim/sim/sim/configs/rust/defconfig @@ -37,6 +37,7 @@ CONFIG_FSUTILS_PASSWD=y CONFIG_FSUTILS_PASSWD_READONLY=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -60,7 +61,6 @@ CONFIG_NSH_MOTD_STRING="This is an example NuttX Message Of The Day (MOTD). Have CONFIG_NSH_READLINE=y CONFIG_PATH_INITIAL="/bin" CONFIG_PSEUDOFS_ATTRIBUTES=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_SCHED_HAVE_PARENT=y CONFIG_SCHED_WAITPID=y diff --git a/boards/sim/sim/sim/configs/segger/defconfig b/boards/sim/sim/sim/configs/segger/defconfig index 6341241e71f..aec82117a8a 100644 --- a/boards/sim/sim/sim/configs/segger/defconfig +++ b/boards/sim/sim/sim/configs/segger/defconfig @@ -35,6 +35,7 @@ CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -58,7 +59,6 @@ CONFIG_NSH_MOTD_STRING="This is an example NuttX Message Of The Day (MOTD). Have CONFIG_NSH_READLINE=y CONFIG_PATH_INITIAL="/bin" CONFIG_PSEUDOFS_ATTRIBUTES=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_SCHED_CRITMONITOR=y CONFIG_SCHED_HAVE_PARENT=y diff --git a/boards/sim/sim/sim/configs/smartfs/defconfig b/boards/sim/sim/sim/configs/smartfs/defconfig index 537c9d89577..d580009a75b 100644 --- a/boards/sim/sim/sim/configs/smartfs/defconfig +++ b/boards/sim/sim/sim/configs/smartfs/defconfig @@ -35,6 +35,7 @@ CONFIG_EXAMPLES_HELLO=y CONFIG_FSUTILS_PASSWD=y CONFIG_FSUTILS_PASSWD_READONLY=y CONFIG_FS_BINFS=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -57,7 +58,6 @@ CONFIG_NSH_MOTD=y CONFIG_NSH_MOTD_STRING="This is an example NuttX Message Of The Day (MOTD). Have fun!" CONFIG_NSH_READLINE=y CONFIG_PSEUDOFS_ATTRIBUTES=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_QSPI_FLASH=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_SCHED_HAVE_PARENT=y diff --git a/boards/sim/sim/sim/configs/sqlite/defconfig b/boards/sim/sim/sim/configs/sqlite/defconfig index 64f86e5372c..1752c430f14 100644 --- a/boards/sim/sim/sim/configs/sqlite/defconfig +++ b/boards/sim/sim/sim/configs/sqlite/defconfig @@ -30,6 +30,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_FS_HOSTFS=y CONFIG_FS_LARGEFILE=y +CONFIG_FS_LINKS=y CONFIG_FS_LOCK_BUCKET_SIZE=4 CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y @@ -48,7 +49,6 @@ CONFIG_NSH_FILE_APPS=y CONFIG_NSH_READLINE=y CONFIG_PATH_INITIAL="/bin" CONFIG_PIPES=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_SCHED_HAVE_PARENT=y diff --git a/boards/sim/sim/sim/configs/tcpblaster/defconfig b/boards/sim/sim/sim/configs/tcpblaster/defconfig index b21851917af..57b1f38d2a9 100644 --- a/boards/sim/sim/sim/configs/tcpblaster/defconfig +++ b/boards/sim/sim/sim/configs/tcpblaster/defconfig @@ -24,6 +24,7 @@ CONFIG_EXAMPLES_TCPBLASTER=y CONFIG_EXAMPLES_TCPECHO=y CONFIG_FS_BINFS=y CONFIG_FS_HOSTFS=y +CONFIG_FS_LINKS=y CONFIG_FS_LITTLEFS=y CONFIG_FS_PROCFS=y CONFIG_FS_TMPFS=y @@ -78,7 +79,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILE_APPS=y CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PSEUDOTERM=y CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAMMTD=y diff --git a/boards/sim/sim/sim/configs/toybox/defconfig b/boards/sim/sim/sim/configs/toybox/defconfig index b8a6c76c232..e14bc604e7d 100644 --- a/boards/sim/sim/sim/configs/toybox/defconfig +++ b/boards/sim/sim/sim/configs/toybox/defconfig @@ -34,6 +34,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y CONFIG_FS_HOSTFS=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -56,7 +57,6 @@ CONFIG_PATH_INITIAL="/bin" CONFIG_PIPES=y CONFIG_PSEUDOFS_ATTRIBUTES=y CONFIG_PSEUDOFS_FILE=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_CMD_HISTORY=y CONFIG_READLINE_EDIT_EMACS=y CONFIG_READLINE_TABCOMPLETION=y diff --git a/boards/sim/sim/sim/configs/txmorse/defconfig b/boards/sim/sim/sim/configs/txmorse/defconfig index 91b87107cab..2a99389945a 100644 --- a/boards/sim/sim/sim/configs/txmorse/defconfig +++ b/boards/sim/sim/sim/configs/txmorse/defconfig @@ -36,6 +36,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y CONFIG_FS_HOSTFS=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -60,7 +61,6 @@ CONFIG_PATH_INITIAL="/bin" CONFIG_PIPES=y CONFIG_PSEUDOFS_ATTRIBUTES=y CONFIG_PSEUDOFS_FILE=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_RTC=y CONFIG_RTC_ARCH=y diff --git a/boards/sim/sim/sim/configs/usbdev/defconfig b/boards/sim/sim/sim/configs/usbdev/defconfig index 8328fdfb6bc..1ea813309e1 100644 --- a/boards/sim/sim/sim/configs/usbdev/defconfig +++ b/boards/sim/sim/sim/configs/usbdev/defconfig @@ -32,6 +32,7 @@ CONFIG_DEBUG_USB=y CONFIG_DEBUG_USB_ERROR=y CONFIG_DEBUG_USB_WARN=y CONFIG_EXAMPLES_DHCPD=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_TMPFS=y CONFIG_ICMPv6_AUTOCONF_RDNSS=y @@ -86,7 +87,6 @@ CONFIG_NET_UDP_NOTIFIER=y CONFIG_NET_UDP_WRITE_BUFFERS=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PSEUDOTERM=y CONFIG_READLINE_CMD_HISTORY=y CONFIG_READLINE_TABCOMPLETION=y diff --git a/boards/sim/sim/sim/configs/usbhost/defconfig b/boards/sim/sim/sim/configs/usbhost/defconfig index afdde97ade7..991413a5672 100644 --- a/boards/sim/sim/sim/configs/usbhost/defconfig +++ b/boards/sim/sim/sim/configs/usbhost/defconfig @@ -22,6 +22,7 @@ CONFIG_DEBUG_USB=y CONFIG_DEBUG_USB_ERROR=y CONFIG_DEBUG_USB_INFO=y CONFIG_DEBUG_USB_WARN=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_TMPFS=y CONFIG_INIT_ENTRYPOINT="nsh_main" @@ -29,7 +30,6 @@ CONFIG_LIBC_DLFCN=y CONFIG_LIBC_EXECFUNCS=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PSEUDOTERM=y CONFIG_READLINE_CMD_HISTORY=y CONFIG_READLINE_TABCOMPLETION=y diff --git a/boards/sim/sim/sim/configs/watchdog-notifier/defconfig b/boards/sim/sim/sim/configs/watchdog-notifier/defconfig index df6350b258c..2ba1f883faf 100644 --- a/boards/sim/sim/sim/configs/watchdog-notifier/defconfig +++ b/boards/sim/sim/sim/configs/watchdog-notifier/defconfig @@ -31,6 +31,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y CONFIG_FS_HOSTFS=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -54,7 +55,6 @@ CONFIG_PATH_INITIAL="/bin" CONFIG_PIPES=y CONFIG_PSEUDOFS_ATTRIBUTES=y CONFIG_PSEUDOFS_FILE=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_RTC=y CONFIG_RTC_ARCH=y diff --git a/boards/sim/sim/sim/configs/zipfs/defconfig b/boards/sim/sim/sim/configs/zipfs/defconfig index b169fb0bf42..16a5988213c 100644 --- a/boards/sim/sim/sim/configs/zipfs/defconfig +++ b/boards/sim/sim/sim/configs/zipfs/defconfig @@ -33,6 +33,7 @@ CONFIG_FAT_LFN=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y CONFIG_FS_HOSTFS=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_RAMMAP=y CONFIG_FS_ROMFS=y @@ -58,7 +59,6 @@ CONFIG_NSH_MOTD_STRING="This is an example NuttX Message Of The Day (MOTD). Have CONFIG_NSH_READLINE=y CONFIG_PATH_INITIAL="/bin" CONFIG_PSEUDOFS_ATTRIBUTES=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_SCHED_BACKTRACE=y CONFIG_SCHED_HAVE_PARENT=y diff --git a/boards/x86_64/qemu/qemu-intel64/configs/nxterm/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/nxterm/defconfig index 36657169126..44e58c48ab9 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/nxterm/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/nxterm/defconfig @@ -71,6 +71,7 @@ CONFIG_EXAMPLES_WGET=y CONFIG_EXPERIMENTAL=y CONFIG_FS_FAT=y CONFIG_FS_LARGEFILE=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_FS_TMPFS=y @@ -134,7 +135,6 @@ CONFIG_PCI=y CONFIG_PCI_MSIX=y CONFIG_PREALLOC_CHILDSTATUS=16 CONFIG_PRIORITY_INHERITANCE=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PSEUDOTERM=y CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_PTHREAD_STACK_MIN=4194304 diff --git a/boards/x86_64/qemu/qemu-intel64/configs/python/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/python/defconfig index a054dc0ff89..a109a6ebb65 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/python/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/python/defconfig @@ -39,6 +39,7 @@ CONFIG_DEV_URANDOM=y CONFIG_EVENT_FD=y CONFIG_EXPERIMENTAL=y CONFIG_FS_LARGEFILE=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_FS_TMPFS=y @@ -83,7 +84,6 @@ CONFIG_PCI_MSIX=y CONFIG_PIPES=y CONFIG_PREALLOC_CHILDSTATUS=16 CONFIG_PRIORITY_INHERITANCE=y -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_PTHREAD_STACK_MIN=4194304 CONFIG_RAM_SIZE=268435456 diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/mbedtls/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/mbedtls/defconfig index 8523f8df0d9..2c7b1b4aea5 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/mbedtls/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/mbedtls/defconfig @@ -41,6 +41,7 @@ CONFIG_ETC_ROMFS=y CONFIG_EXAMPLES_RANDOM=y CONFIG_EXPERIMENTAL=y CONFIG_FS_LARGEFILE=y +CONFIG_FS_LINKS=y CONFIG_FS_LITTLEFS=y CONFIG_FS_LITTLEFS_MULTI_VERSION=y CONFIG_FS_LITTLEFS_VERSION="v2.10.1" @@ -83,7 +84,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/python/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/python/defconfig index 6fc61754568..792a0b095d3 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/python/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/python/defconfig @@ -45,6 +45,7 @@ CONFIG_EVENT_FD=y CONFIG_EXAMPLES_WGET=y CONFIG_EXAMPLES_WS2812=y CONFIG_EXPERIMENTAL=y +CONFIG_FS_LINKS=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_FS_TMPFS=y @@ -87,7 +88,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_debug/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_debug/defconfig index bf8ed62d419..76b57d5e070 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_debug/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_debug/defconfig @@ -40,6 +40,7 @@ CONFIG_EXAMPLES_RANDOM=y CONFIG_EXPERIMENTAL=y CONFIG_FS_HOSTFS=y CONFIG_FS_LARGEFILE=y +CONFIG_FS_LINKS=y CONFIG_FS_LITTLEFS=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y @@ -76,7 +77,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_toywasm/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_toywasm/defconfig index ceb7ff711b6..33acd0b08ad 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_toywasm/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/qemu_toywasm/defconfig @@ -40,6 +40,7 @@ CONFIG_EXAMPLES_RANDOM=y CONFIG_EXPERIMENTAL=y CONFIG_FS_HOSTFS=y CONFIG_FS_LARGEFILE=y +CONFIG_FS_LINKS=y CONFIG_FS_LITTLEFS=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y @@ -77,7 +78,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/toywasm/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/toywasm/defconfig index 048e270c708..9433a6b5141 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/toywasm/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/toywasm/defconfig @@ -39,6 +39,7 @@ CONFIG_ETC_ROMFS=y CONFIG_EXAMPLES_RANDOM=y CONFIG_EXPERIMENTAL=y CONFIG_FS_LARGEFILE=y +CONFIG_FS_LINKS=y CONFIG_FS_LITTLEFS=y CONFIG_FS_LITTLEFS_MULTI_VERSION=y CONFIG_FS_LITTLEFS_VERSION="v2.10.1" @@ -76,7 +77,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PSEUDOFS_SOFTLINKS=y CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 diff --git a/fs/Kconfig b/fs/Kconfig index db8e7ded310..b2aef67bb81 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -115,7 +115,7 @@ config FS_PERMISSION comment "UNIX filesystem permission support requires SCHED_USER_IDENTITY=y, PSEUDOFS_ATTRIBUTES=y and DISABLE_PSEUDOFS_OPERATIONS=n" depends on !SCHED_USER_IDENTITY || !PSEUDOFS_ATTRIBUTES || DISABLE_PSEUDOFS_OPERATIONS -config PSEUDOFS_SOFTLINKS +config FS_LINKS bool "Pseudo-filesystem soft links" default n depends on !DISABLE_PSEUDOFS_OPERATIONS diff --git a/fs/inode/fs_inodefree.c b/fs/inode/fs_inodefree.c index 7b7fc314c85..517eb410462 100644 --- a/fs/inode/fs_inodefree.c +++ b/fs/inode/fs_inodefree.c @@ -53,7 +53,7 @@ void inode_free(FAR struct inode *inode) if (inode != NULL) { -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS /* Symbol links should never have peers or children */ DEBUGASSERT(!INODE_IS_SOFTLINK(inode) || @@ -65,7 +65,7 @@ void inode_free(FAR struct inode *inode) inode_free(inode->i_peer); inode_free(inode->i_child); -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS /* If the inode is a symbolic link, the free the path to the linked * entity. */ diff --git a/fs/inode/fs_inoderemove.c b/fs/inode/fs_inoderemove.c index aad079325e5..064d4a7ccfe 100644 --- a/fs/inode/fs_inoderemove.c +++ b/fs/inode/fs_inoderemove.c @@ -120,7 +120,7 @@ static FAR struct inode *inode_unlink(FAR const char *path) inode->i_peer = NULL; inode->i_parent = NULL; atomic_sub(&inode->i_crefs, 1); -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS if (INODE_IS_HARDLINK(inode)) { FAR struct inode *target; diff --git a/fs/inode/fs_inodesearch.c b/fs/inode/fs_inodesearch.c index 1b2f69eb643..8793a4ae0c0 100644 --- a/fs/inode/fs_inodesearch.c +++ b/fs/inode/fs_inodesearch.c @@ -43,7 +43,7 @@ ****************************************************************************/ static int _inode_compare(FAR const char *fname, FAR struct inode *inode); -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS static int _inode_linktarget(FAR struct inode *inode, FAR struct inode_search_s *desc); #endif @@ -144,7 +144,7 @@ static int _inode_compare(FAR const char *fname, FAR struct inode *inode) * ****************************************************************************/ -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS static int _inode_linktarget(FAR struct inode *inode, FAR struct inode_search_s *desc) { @@ -297,7 +297,7 @@ static int _inode_search(FAR struct inode_search_s *desc) { /* More nodes to be examined in the path "below" this one. */ -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS /* Was the node a soft link? If so, then we need need to * continue below the target of the link, not the link itself. */ @@ -493,7 +493,7 @@ int inode_search(FAR struct inode_search_s *desc) ret = _inode_search(desc); -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS if (ret >= 0) { FAR struct inode *inode; diff --git a/fs/vfs/CMakeLists.txt b/fs/vfs/CMakeLists.txt index 3880b2a3727..b5318de6719 100644 --- a/fs/vfs/CMakeLists.txt +++ b/fs/vfs/CMakeLists.txt @@ -66,7 +66,7 @@ if(NOT "${CONFIG_FS_LOCK_BUCKET_SIZE}" STREQUAL "0") list(APPEND SRCS fs_lock.c) endif() -if(NOT "${CONFIG_PSEUDOFS_SOFTLINKS}" STREQUAL "0") +if(NOT "${CONFIG_FS_LINKS}" STREQUAL "0") list(APPEND SRCS fs_symlink.c fs_readlink.c) endif() diff --git a/fs/vfs/Make.defs b/fs/vfs/Make.defs index ce2a7a5f5af..e8e588680e9 100644 --- a/fs/vfs/Make.defs +++ b/fs/vfs/Make.defs @@ -37,7 +37,7 @@ ifneq ($(CONFIG_FS_LOCK_BUCKET_SIZE),0) CSRCS += fs_lock.c endif -ifneq ($(CONFIG_PSEUDOFS_SOFTLINKS),0) +ifneq ($(CONFIG_FS_LINKS),0) CSRCS += fs_symlink.c fs_readlink.c endif diff --git a/fs/vfs/fs_chstat.c b/fs/vfs/fs_chstat.c index d5da5b91798..a8adcb342a3 100644 --- a/fs/vfs/fs_chstat.c +++ b/fs/vfs/fs_chstat.c @@ -425,7 +425,7 @@ int inode_chstat(FAR struct inode *inode, DEBUGASSERT(inode != NULL && buf != NULL); -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS /* Handle softlinks differently. Just call chstat() recursively on the * target of the softlink. */ diff --git a/fs/vfs/fs_dir.c b/fs/vfs/fs_dir.c index dfa074b1e44..75f54db3632 100644 --- a/fs/vfs/fs_dir.c +++ b/fs/vfs/fs_dir.c @@ -322,7 +322,7 @@ static int read_pseudodir(FAR struct fs_dirent_s *dir, strlcpy(entry->d_name, next->i_name, sizeof(entry->d_name)); -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS if (INODE_IS_HARDLINK(next)) { DEBUGASSERT(next->i_private != NULL); @@ -350,7 +350,7 @@ static int read_pseudodir(FAR struct fs_dirent_s *dir, } else #endif -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS if (INODE_IS_SOFTLINK(next)) { entry->d_type = DTYPE_LINK; diff --git a/fs/vfs/fs_link.c b/fs/vfs/fs_link.c index b580a9aae82..03c49f75cd3 100644 --- a/fs/vfs/fs_link.c +++ b/fs/vfs/fs_link.c @@ -44,7 +44,7 @@ * Pre-processor Definitions ****************************************************************************/ -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS /**************************************************************************** * Public Functions @@ -211,15 +211,15 @@ errout: return ERROR; } -#else /* CONFIG_PSEUDOFS_SOFTLINKS */ +#else /* CONFIG_FS_LINKS */ /**************************************************************************** * Name: link * * Description: - * When CONFIG_PSEUDOFS_SOFTLINKS is disabled, link() is not supported. - * The symbol is still provided so that applications referencing link() - * continue to link, but the call always fails with ENOSYS. + * When CONFIG_FS_LINKS is disabled, link() is not supported. The symbol + * is still provided so that applications referencing link() continue to + * link, but the call always fails with ENOSYS. * ****************************************************************************/ @@ -232,4 +232,4 @@ int link(FAR const char *path1, FAR const char *path2) return ERROR; } -#endif /* CONFIG_PSEUDOFS_SOFTLINKS */ +#endif /* CONFIG_FS_LINKS */ diff --git a/fs/vfs/fs_open.c b/fs/vfs/fs_open.c index a6c10c98023..35518d77fbf 100644 --- a/fs/vfs/fs_open.c +++ b/fs/vfs/fs_open.c @@ -128,7 +128,7 @@ static int file_vopen(FAR struct file *filep, FAR const char *path, inode = desc.node; DEBUGASSERT(inode != NULL); -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS if (INODE_IS_HARDLINK(inode)) { /* The inode is a hard link. The actual inode is referenced diff --git a/fs/vfs/fs_readlink.c b/fs/vfs/fs_readlink.c index 3a057ad895d..e75ad191886 100644 --- a/fs/vfs/fs_readlink.c +++ b/fs/vfs/fs_readlink.c @@ -36,7 +36,7 @@ #include "inode/inode.h" -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS /**************************************************************************** * Public Functions @@ -132,4 +132,4 @@ errout_with_search: return ERROR; } -#endif /* CONFIG_PSEUDOFS_SOFTLINKS */ +#endif /* CONFIG_FS_LINKS */ diff --git a/fs/vfs/fs_rename.c b/fs/vfs/fs_rename.c index 4428354929a..183fb6e5ae6 100644 --- a/fs/vfs/fs_rename.c +++ b/fs/vfs/fs_rename.c @@ -136,7 +136,7 @@ static int pseudorename(FAR const char *oldpath, FAR struct inode *oldinode, */ if ((newinode->u.i_ops == NULL || newinode->i_child != NULL) -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS && !INODE_IS_HARDLINK(newinode) #endif ) @@ -221,7 +221,7 @@ static int pseudorename(FAR const char *oldpath, FAR struct inode *oldinode, #endif newinode->i_private = oldinode->i_private; /* Per inode driver private data */ -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS /* Prevent the link target string from being deallocated. The pointer to * the allocated link target path was copied above (under the guise of * u.i_ops). Now we must nullify the u.i_link pointer so that it is not diff --git a/fs/vfs/fs_stat.c b/fs/vfs/fs_stat.c index bceba8e70d4..60259cca12e 100644 --- a/fs/vfs/fs_stat.c +++ b/fs/vfs/fs_stat.c @@ -267,7 +267,7 @@ int inode_stat(FAR struct inode *inode, FAR struct stat *buf, int resolve) RESET_BUF(buf); -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS if (INODE_IS_HARDLINK(inode)) { DEBUGASSERT(inode->i_private != NULL); @@ -326,7 +326,7 @@ int inode_stat(FAR struct inode *inode, FAR struct stat *buf, int resolve) } else #endif -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS /* Handle softlinks differently. Just call stat() recursively on the * target of the softlink. * @@ -477,7 +477,7 @@ int inode_stat(FAR struct inode *inode, FAR struct stat *buf, int resolve) buf->st_ctim = inode->i_ctime; #endif buf->st_ino = inode->i_ino; -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS buf->st_nlink = INODE_GET_NLINK(inode); #endif diff --git a/fs/vfs/fs_symlink.c b/fs/vfs/fs_symlink.c index 552b1397774..f4a828117ec 100644 --- a/fs/vfs/fs_symlink.c +++ b/fs/vfs/fs_symlink.c @@ -45,7 +45,7 @@ * Pre-processor Definitions ****************************************************************************/ -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS /**************************************************************************** * Public Functions @@ -183,4 +183,4 @@ errout: return ERROR; } -#endif /* CONFIG_PSEUDOFS_SOFTLINKS */ +#endif /* CONFIG_FS_LINKS */ diff --git a/fs/vfs/fs_unlink.c b/fs/vfs/fs_unlink.c index b3c54d20414..9d7be5dc545 100644 --- a/fs/vfs/fs_unlink.c +++ b/fs/vfs/fs_unlink.c @@ -156,7 +156,7 @@ int nx_unlink(FAR const char *pathname) } #endif else if ( -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS INODE_IS_SOFTLINK(inode) || INODE_IS_HARDLINK(inode) || #endif INODE_IS_PSEUDODIR(inode)) diff --git a/include/nuttx/fs/fs.h b/include/nuttx/fs/fs.h index 5b9eb33a945..33ef992a861 100644 --- a/include/nuttx/fs/fs.h +++ b/include/nuttx/fs/fs.h @@ -433,7 +433,7 @@ union inode_ops_u #ifdef CONFIG_FS_NAMED_EVENTS FAR struct nevent_inode_s *i_nevent; /* Named event */ #endif -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS FAR char *i_link; /* Full path to link target */ #endif }; diff --git a/include/sys/syscall_lookup.h b/include/sys/syscall_lookup.h index 55a20f7f135..9b106b5e997 100644 --- a/include/sys/syscall_lookup.h +++ b/include/sys/syscall_lookup.h @@ -285,7 +285,7 @@ SYSCALL_LOOKUP(munmap, 2) SYSCALL_LOOKUP(munlock, 2) SYSCALL_LOOKUP(munlockall, 0) -#if defined(CONFIG_PSEUDOFS_SOFTLINKS) +#if defined(CONFIG_FS_LINKS) SYSCALL_LOOKUP(link, 2) SYSCALL_LOOKUP(symlink, 2) SYSCALL_LOOKUP(readlink, 3) diff --git a/libs/libc/stdlib/lib_realpath.c b/libs/libc/stdlib/lib_realpath.c index 3973e1ac73d..c381d7d044a 100644 --- a/libs/libc/stdlib/lib_realpath.c +++ b/libs/libc/stdlib/lib_realpath.c @@ -41,7 +41,7 @@ FAR char *lib_realpath(FAR const char *path, FAR char *resolved, bool notfollow) { -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS FAR char *wbuf[2] = { }; @@ -124,7 +124,7 @@ loop: *p = '\0'; -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS if (wbuf[0] != NULL) { lib_free(wbuf[0]); @@ -198,7 +198,7 @@ loop: goto out; } -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS if (S_ISLNK(sb.st_mode)) { if (nlnk++ >= SYMLOOP_MAX) @@ -267,7 +267,7 @@ loop: out: lib_free(fres); -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS if (wbuf[0] != NULL) { lib_free(wbuf[0]); diff --git a/libs/libc/unistd/lib_linkat.c b/libs/libc/unistd/lib_linkat.c index 1448f2a756f..54f83835606 100644 --- a/libs/libc/unistd/lib_linkat.c +++ b/libs/libc/unistd/lib_linkat.c @@ -29,7 +29,7 @@ #include "libc.h" -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS /**************************************************************************** * Public Functions @@ -119,4 +119,4 @@ int linkat(int olddirfd, FAR const char *path1, return ret; } -#endif /* CONFIG_PSEUDOFS_SOFTLINKS */ +#endif /* CONFIG_FS_LINKS */ diff --git a/libs/libc/unistd/lib_readlinkat.c b/libs/libc/unistd/lib_readlinkat.c index 3fa2e8705ae..d307bd06821 100644 --- a/libs/libc/unistd/lib_readlinkat.c +++ b/libs/libc/unistd/lib_readlinkat.c @@ -29,7 +29,7 @@ #include "libc.h" -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS /**************************************************************************** * Public Functions @@ -93,4 +93,4 @@ ssize_t readlinkat(int dirfd, FAR const char *path, FAR char *buf, return ret; } -#endif /* CONFIG_PSEUDOFS_SOFTLINKS */ +#endif /* CONFIG_FS_LINKS */ diff --git a/libs/libc/unistd/lib_symlinkat.c b/libs/libc/unistd/lib_symlinkat.c index 6063839ebc6..31a14691f83 100644 --- a/libs/libc/unistd/lib_symlinkat.c +++ b/libs/libc/unistd/lib_symlinkat.c @@ -29,7 +29,7 @@ #include "libc.h" -#ifdef CONFIG_PSEUDOFS_SOFTLINKS +#ifdef CONFIG_FS_LINKS /**************************************************************************** * Public Functions @@ -90,4 +90,4 @@ int symlinkat(FAR const char *path1, int dirfd, FAR const char *path2) return ret; } -#endif /* CONFIG_PSEUDOFS_SOFTLINKS */ +#endif /* CONFIG_FS_LINKS */ diff --git a/syscall/syscall.csv b/syscall/syscall.csv index c488776b3c4..439630d7130 100644 --- a/syscall/syscall.csv +++ b/syscall/syscall.csv @@ -63,7 +63,7 @@ "kill","signal.h","","int","pid_t","int" "lchmod","sys/stat.h","","int","FAR const char *","mode_t" "lchown","unistd.h","","int","FAR const char *","uid_t","gid_t" -"link","unistd.h","defined(CONFIG_PSEUDOFS_SOFTLINKS)","int","FAR const char *","FAR const char *" +"link","unistd.h","defined(CONFIG_FS_LINKS)","int","FAR const char *","FAR const char *" "listen","sys/socket.h","defined(CONFIG_NET)","int","int","int" "lseek","unistd.h","","off_t","int","off_t","int" "lstat","sys/stat.h","","int","FAR const char *","FAR struct stat *" @@ -131,7 +131,7 @@ "pwrite","unistd.h","","ssize_t","int","FAR const void *","size_t","off_t" "read","unistd.h","","ssize_t","int","FAR void *","size_t" "readv","sys/uio.h","","ssize_t","int","FAR const struct iovec *","int" -"readlink","unistd.h","defined(CONFIG_PSEUDOFS_SOFTLINKS)","ssize_t","FAR const char *","FAR char *","size_t" +"readlink","unistd.h","defined(CONFIG_FS_LINKS)","ssize_t","FAR const char *","FAR char *","size_t" "recv","sys/socket.h","defined(CONFIG_NET)","ssize_t","int","FAR void *","size_t","int" "recvfrom","sys/socket.h","defined(CONFIG_NET)","ssize_t","int","FAR void*","size_t","int","FAR struct sockaddr*","FAR socklen_t*" "recvmsg","sys/socket.h","defined(CONFIG_NET)","ssize_t","int","FAR struct msghdr *","int" @@ -192,7 +192,7 @@ "socketpair","sys/socket.h","defined(CONFIG_NET)","int","int","int","int","int [2]|FAR int *" "stat","sys/stat.h","","int","FAR const char *","FAR struct stat *" "statfs","sys/statfs.h","","int","FAR const char *","FAR struct statfs *" -"symlink","unistd.h","defined(CONFIG_PSEUDOFS_SOFTLINKS)","int","FAR const char *","FAR const char *" +"symlink","unistd.h","defined(CONFIG_FS_LINKS)","int","FAR const char *","FAR const char *" "sync","unistd.h","","void" "sysinfo","sys/sysinfo.h","","int","FAR struct sysinfo *" "task_create","sched.h","!defined(CONFIG_BUILD_KERNEL)", "int","FAR const char *","int","int","main_t","FAR char * const []|FAR char * const *"