mirror of
https://github.com/apache/nuttx.git
synced 2026-06-07 17:33:08 +08:00
CONFIG_NFILE_DESCRIPTORS=0 can no longer be used to disable the file system. NuttX with no file system does not make sense.
Squashed commit of the following:
configs/: The few configurations that formerly set CONFIG_NFILE_DESCRIPTORS=0 should not default, rather they should set the number of descriptors to 3.
fs/: Remove all conditional logic based on CONFIG_NFILE_DESCRIPTORS == 0
tools/: Tools updates for changes to usage of CONFIG_NFILE_DESCRIPTORS.
syscall/: Remove all conditional logic based on CONFIG_NFILE_DESCRIPTORS == 0
libs/: Remove all conditional logic based on CONFIG_NFILE_DESCRIPTORS == 0
include/: Remove all conditional logic based on CONFIG_NFILE_DESCRIPTORS == 0
drivers/: Remove all conditional logic based on CONFIG_NFILE_DESCRIPTORS == 0
Documentation/: Remove all references to CONFIG_NFILE_DESCRIPTORS == 0
binfmt/: Remove all conditional logic based on CONFIG_NFILE_DESCRIPTORS == 0
arch/: Remove all conditional logic based on CONFIG_NFILE_DESCRIPTORS == 0
net/: Remove all conditional logic based on CONFIG_NFILE_DESCRIPTORS == 0
sched/: Remove all conditional logic based on CONFIG_NFILE_DESCRIPTORS == 0
sched/Kconfig: CONFIG_NFILE_DESCRIPTORS may no longer to set to a value less than 3
configs/: Remove all settings for CONFIG_NFILE_DESCRIPTORS < 3
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
<tr align="center" bgcolor="#e4e4e4">
|
||||
<td>
|
||||
<h1><big><font color="#3c34ec"><i>NuttShell (NSH)</i></font></big></h1>
|
||||
<p>Last Updated: January 19, 2019</p>
|
||||
<p>Last Updated: February 11, 2019</p>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@@ -3616,22 +3616,22 @@ nsh>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>cat</code></b></td>
|
||||
<td><code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td>
|
||||
<td> </td>
|
||||
<td><code>CONFIG_NSH_DISABLE_CAT</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>cd</code></b></td>
|
||||
<td>!<code>CONFIG_DISABLE_ENVIRON</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td>
|
||||
<td>!<code>CONFIG_DISABLE_ENVIRON</code></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_CD</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>cmp</code></b></td>
|
||||
<td><code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td>
|
||||
<td> </td>
|
||||
<td><code>CONFIG_NSH_DISABLE_CMP</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>cp</code></b></td>
|
||||
<td><code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td>
|
||||
<td> </td>
|
||||
<td><code>CONFIG_NSH_DISABLE_CP</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -3641,7 +3641,7 @@ nsh>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>dd</code></b></td>
|
||||
<td><code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td>
|
||||
<td> </td>
|
||||
<td><code>CONFIG_NSH_DISABLE_DD</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -3651,7 +3651,7 @@ nsh>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>df</code></b></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_FS_READABLE</code><sup>3</sup></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_FS_READABLE</code><sup>3</sup></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_DF</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -3666,7 +3666,7 @@ nsh>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>env</code></b></td>
|
||||
<td><code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_FS_PROCFS</code> && !<code>CONFIG_DISABLE_ENVIRON</code> && !<code>CONFIG_PROCFS_EXCLUDE_ENVIRON</code>
|
||||
<td><code>CONFIG_FS_PROCFS</code> && !<code>CONFIG_DISABLE_ENVIRON</code> && !<code>CONFIG_PROCFS_EXCLUDE_ENVIRON</code>
|
||||
<td><code>CONFIG_NSH_DISABLE_ENV</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -3691,8 +3691,7 @@ nsh>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>get</code></b></td>
|
||||
<td><code>CONFIG_NET</code> && <code>CONFIG_NET_UDP</code> &&
|
||||
<code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <i>MTU</i> >= 558<sup>1</sup></td>
|
||||
<td><code>CONFIG_NET</code> && <code>CONFIG_NET_UDP</code> && <i>MTU</i> >= 558<sup>1</sup></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_GET</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -3702,7 +3701,7 @@ nsh>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>hexdump</code></b></td>
|
||||
<td><code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td>
|
||||
<td> </td>
|
||||
<td><code>CONFIG_NSH_DISABLE_HEXDUMP</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -3737,17 +3736,17 @@ nsh>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>losetup</code></b></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_DEV_LOOP</code></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_DEV_LOOP</code></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_LOSETUP</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>ln</code></b></td>
|
||||
<td><code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_PSEUDOFS_SOFTLINKS</code></td>
|
||||
<td><code>CONFIG_PSEUDOFS_SOFTLINKS</code></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_LN</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>ls</code></b></td>
|
||||
<td><code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td>
|
||||
<td> </td>
|
||||
<td><code>CONFIG_NSH_DISABLE_LS</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -3771,37 +3770,37 @@ nsh>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>mkdir</code></b></td>
|
||||
<td>(((!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_FS_WRITABLE</code>) || !<code>CONFIG_DISABLE_PSEUDOFS_OPERATIONS</code>) && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0)<sup>4</sup></td>
|
||||
<td>(((!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_FS_WRITABLE</code>) || !<code>CONFIG_DISABLE_PSEUDOFS_OPERATIONS</code>)</td>
|
||||
<td><code>CONFIG_NSH_DISABLE_MKDIR</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>mkfatfs</code></b></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_FSUTILS_MKFATFS</code></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_FSUTILS_MKFATFS</code></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_MKFATFS</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>mkfifo</code></b></td>
|
||||
<td><code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_PIPES</code> && <code>CONFIG_DEV_FIFO_SIZE</code> > 0</td>
|
||||
<td><code>CONFIG_PIPES</code> && <code>CONFIG_DEV_FIFO_SIZE</code> > 0</td>
|
||||
<td><code>CONFIG_NSH_DISABLE_MKFIFO</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>mkrd</code></b></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_FS_WRITABLE</code><sup>4</sup></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_FS_WRITABLE</code><sup>4</sup></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_MKRD</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>mount</code></b></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_FS_READABLE</code><sup>3</sup></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_FS_READABLE</code><sup>3</sup></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_MOUNT</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>mv</code></b></td>
|
||||
<td>(((!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_FS_WRITABLE</code>) || !<code>CONFIG_DISABLE_PSEUDOFS_OPERATIONS</code>) && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0)<sup>4</sup></td>
|
||||
<td>(!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_FS_WRITABLE</code>) || !<code>CONFIG_DISABLE_PSEUDOFS_OPERATIONS</code><sup>4</sup></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_MV</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>nfsmount</code></b></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_NET</code> && <code>CONFIG_NFS</code></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NET</code> && <code>CONFIG_NFS</code></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_NFSMOUNT</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -3811,7 +3810,7 @@ nsh>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>passwd</code></b></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_FS_WRITABLE</code> && <code>CONFIG_NSH_LOGIN_PASSWD</code></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_FS_WRITABLE</code> && <code>CONFIG_NSH_LOGIN_PASSWD</code>sup>4</sup></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_PASSWD</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -3827,17 +3826,17 @@ nsh>
|
||||
<tr>
|
||||
<td><b><code>put</code></b></td>
|
||||
<td><code>CONFIG_NET</code> && <code>CONFIG_NET_UDP</code> &&
|
||||
<code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <i>MTU</i> >= 558<sup>1,2</sup></td>
|
||||
<code><i>MTU</i> >= 558<sup>1,2</sup></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_PUT</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>pwd</code></b></td>
|
||||
<td>!<code>CONFIG_DISABLE_ENVIRON</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td>
|
||||
<td>!<code>CONFIG_DISABLE_ENVIRON</code></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_PWD</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>readlink</code></b></td>
|
||||
<td><code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_PSEUDOFS_SOFTLINKS</code></td>
|
||||
<td><code>CONFIG_PSEUDOFS_SOFTLINKS</code></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_READLINK</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -3847,12 +3846,12 @@ nsh>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>rm</code></b></td>
|
||||
<td>(((!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_FS_WRITABLE</code>) || !<code>CONFIG_DISABLE_PSEUDOFS_OPERATIONS</code>) && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0)<sup>4</sup></td>
|
||||
<td>(!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_FS_WRITABLE</code>) || !<code>CONFIG_DISABLE_PSEUDOFS_OPERATIONS</code><sup>4</sup></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_RM</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>rmdir</code></b></td>
|
||||
<td>(((!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_FS_WRITABLE</code>) || !<code>CONFIG_DISABLE_PSEUDOFS_OPERATIONS</code>) && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0)<sup>4</sup></td>
|
||||
<td>(!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_FS_WRITABLE</code>) || !<code>CONFIG_DISABLE_PSEUDOFS_OPERATIONS</code><sup>4</sup></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_RMDIR</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -3872,7 +3871,7 @@ nsh>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>sh</code></b></td>
|
||||
<td><code>CONFIG_NFILE_DESCRIPTORS > 0 && <code>CONFIG_NFILE_STREAMS > 0 && !<code>CONFIG_NSH_DISABLESCRIPT</code></td>
|
||||
<td><code>CONFIG_NFILE_STREAMS > 0 && !<code>CONFIG_NSH_DISABLESCRIPT</code></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_SH</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -3902,12 +3901,12 @@ nsh>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>truncate</code></b></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_TRUNCATE</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>umount</code></b></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_FS_READABLE</code><sup>3</sup></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_FS_READABLE</code><sup>3</sup></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_UMOUNT</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -3932,12 +3931,12 @@ nsh>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>useradd</code></b></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_FS_WRITABLE</code> && <code>CONFIG_NSH_LOGIN_PASSWD</code></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_FS_WRITABLE</code> && <code>CONFIG_NSH_LOGIN_PASSWD</code>sup>4</sup></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_USERADD</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>userdel</code></b></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_FS_WRITABLE</code> && <code>CONFIG_NSH_LOGIN_PASSWD</code></td>
|
||||
<td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_FS_WRITABLE</code> && <code>CONFIG_NSH_LOGIN_PASSWD</code>sup>4</sup></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_USERDEL</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -3947,8 +3946,7 @@ nsh>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b><code>wget</code></b></td>
|
||||
<td><code>CONFIG_NET</code> && <code>CONFIG_NET_TCP</code> &&
|
||||
<code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td>
|
||||
<td><code>CONFIG_NET</code> && <code>CONFIG_NET_TCP</code></td>
|
||||
<td><code>CONFIG_NSH_DISABLE_WGET</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
Reference in New Issue
Block a user