apps/builtin/binfs.c moved to nuttx/fs/binfs/fs_binfs.c

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5523 42af7a65-404d-4744-a932-0658087f49c3

ChangeLog

@@ -3955,4 +3955,5 @@
 	* arch/mips/src/mips32/up_vfork.c, up_vfork.h, and vfork.S:
 	  Implement vfork() for MIPS32 (no floating point support)
 	* configs/ubw32/ostest: Enable the vfork() test.
-
+	* fs/binfs:  Move apps/builtin/binfs.c to fs/binfs/fs_binfs.c
+	  CONFIG_APPS_BINDIR rename CONFIG_FS_BINFS

configs/sim/README.txt

@@ -270,8 +270,9 @@ nsh
 
   Description
   -----------
-  Configures to use the NuttShell at apps/examples/nsh.  This configuration
+  Configures to use the NuttShell at apps/examples/nsh.  This version has
-  may be selected as follows:
+  one builtin function:  This configuration: apps/examples/hello.  This
+  configuration may be selected as follows:
 
     cd <nuttx-directory>/tools
     ./configure.sh sim/nsh
@@ -281,7 +282,7 @@ nsh2
   Description
   -----------
   This is another example that configures to use the NuttShell at apps/examples/nsh.
-  Unlike nsh, this version uses NSH built-in functions.  The nx, nxhello, and
+  Like nsh, this version uses NSH built-in functions:  The nx, nxhello, and
   nxlines examples are included as built-in functions.
 
   X11 Configuration

configs/sim/nsh/appconfig

@@ -42,3 +42,6 @@ CONFIGURED_APPS += examples/nsh
 CONFIGURED_APPS += system/readline
 CONFIGURED_APPS += nshlib
 
+# Example built-in application
+
+CONFIGURED_APPS += examples/hello

configs/sim/nsh/defconfig

@@ -1,7 +1,7 @@
 ############################################################################
 # sim/nsh/defconfig
 #
-#   Copyright (C) 2008-2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008-2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@ CONFIG_ARCH_BOARD_SIM=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
-CONFIG_DEBUG_SYMBOLS=n
+CONFIG_DEBUG_SYMBOLS=y
 
 CONFIG_HAVE_CXX=n
 CONFIG_HAVE_CXXINITIALIZE=n
@@ -170,6 +170,7 @@ CONFIG_FAT_LFN=n
 CONFIG_FAT_MAXFNAME=32
 CONFIG_FS_NXFFS=n
 CONFIG_FS_ROMFS=y
+CONFIG_FS_BINFS=y
 
 #
 # TCP/IP and UDP support via uIP
@@ -193,6 +194,11 @@ CONFIG_NET_STATISTICS=y
 #CONFIG_NET_ARPTAB_SIZE=8
 CONFIG_NET_BROADCAST=n
 
+#
+# Settings for examples/hello
+#
+CONFIG_EXAMPLES_HELLO_BUILTIN=y
+
 #
 # UIP Network Utilities
 #
@@ -224,7 +230,7 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
 #
 # Settings for apps/nshlib
 #
-CONFIG_NSH_BUILTIN_APPS=n
+CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=80

configs/vsn/nsh/defconfig

@@ -526,4 +526,4 @@ CONFIG_HEAP_SIZE=
 CONFIG_APPS_DIR="../apps"
 
 # Provide /dev/ramX and then: mount -t binfs /dev/ram0 /bin
-CONFIG_APPS_BINDIR=y
+CONFIG_FS_BINFS=y

fs/Kconfig

@@ -5,11 +5,12 @@
 
 comment "File system configuration"
 
-source fs/fat/Kconfig
 source fs/mmap/Kconfig
+source fs/fat/Kconfig
 source fs/nfs/Kconfig
 source fs/nxffs/Kconfig
 source fs/romfs/Kconfig
+source fs/binfs/Kconfig
 
 comment "System Logging"
 

fs/Makefile

@@ -1,7 +1,7 @@
 ############################################################################
 # fs/Makefile
 #
-#   Copyright (C) 2007, 2008, 2011-2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007, 2008, 2011-2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -72,6 +72,9 @@ CSRCS	+= fs_registerdriver.c fs_unregisterdriver.c
 CSRCS	+= fs_registerblockdriver.c fs_unregisterblockdriver.c \
 		   fs_findblockdriver.c fs_openblockdriver.c fs_closeblockdriver.c
 
+DEPPATH =
+VPATH = .
+
 include mmap/Make.defs
 
 # Stream support
@@ -91,13 +94,17 @@ endif
 # Additional files required is mount-able file systems are supported
 
 ifneq ($(CONFIG_DISABLE_MOUNTPOINT),y)
+
 CSRCS	+= fs_fsync.c fs_mkdir.c fs_mount.c fs_rename.c fs_rmdir.c \
 		   fs_umount.c fs_unlink.c
 CSRCS	+= fs_foreachmountpoint.c 
+
 include fat/Make.defs
 include romfs/Make.defs
 include nxffs/Make.defs
 include nfs/Make.defs
+include binfs/Make.defs
+
 endif
 endif
 
@@ -108,8 +115,7 @@ OBJS	= $(AOBJS) $(COBJS)
 
 BIN		= libfs$(LIBEXT)
 
-SUBDIRS	= mmap fat romfs nxffs:nfs
+SUBDIRS	= mmap fat romfs nxffs nfs binfs
-VPATH	= mmap:fat:romfs:nxffs:nfs
 
 all:	$(BIN)
 
@@ -123,8 +129,7 @@ $(BIN):	$(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) --dep-path . $(MMAPDEPPATH) $(FATDEPPATH) $(ROMFSDEPPATH) $(NXFFSDEPPATH) $(NFSDEPPATH) \
+	$(Q) $(MKDEP) --dep-path . $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
-		"$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	$(Q) touch $@
 
 depend: .depend

fs/binfs/Kconfig

@@ -0,0 +1,19 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
+
+config FS_BINFS
+	bool "BINFS File System"
+	default n
+	depends on BUILTIN
+	---help---
+		The BINFS file system is provides access to builtin applications through
+		the NuttX file system.  The BINFS may, for example, be mount at /bin.
+		Then all of the built-in applications will appear as executable files in
+		/bin.  Then, for example, you list them from NSH like:
+
+		nsh> ls -l /bin
+
+		If the BINFS BINFMT loader is also enabled, then the builtin applications
+		can be executed through the normal mechanisms (posix_spawn(), exev(), etc.)

fs/binfs/Make.defs

@@ -0,0 +1,48 @@
+############################################################################
+# fs/binfs/Make.defs
+#
+#   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name Nuttx nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+ifeq ($(CONFIG_FS_BINFS),y)
+# Files required for BINFS file system support
+
+ASRCS +=
+CSRCS += fs_binfs.c
+
+# Include BINFS build support
+
+DEPPATH += --dep-path binfs
+VPATH += :binfs
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)fs$(DELIM)binfs}
+
+endif

fs/binfs/fs_binfs.c

@@ -0,0 +1,447 @@
+/****************************************************************************
+ * fs/binfs/fs_binfs.c
+ *
+ *   Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+#include <sys/statfs.h>
+#include <sys/stat.h>
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+#include <fcntl.h>
+#include <assert.h>
+#include <errno.h>
+#include <debug.h>
+
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/binfs.h>
+#include <nuttx/fs/dirent.h>
+#include <nuttx/binfmt/builtin.h>
+
+#include <apps/apps.h>
+
+#if !defined(CONFIG_DISABLE_MOUNTPOINT) && defined(CONFIG_FS_BINFS)
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static int     binfs_open(FAR struct file *filep, const char *relpath,
+                          int oflags, mode_t mode);
+static int     binfs_close(FAR struct file *filep);
+static ssize_t binfs_read(FAR struct file *filep, char *buffer, size_t buflen);
+static int     binfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg);
+
+static int     binfs_dup(FAR const struct file *oldp, FAR struct file *newp);
+
+static int     binfs_opendir(struct inode *mountpt, const char *relpath,
+                             struct fs_dirent_s *dir);
+static int     binfs_readdir(FAR struct inode *mountpt,
+                             FAR struct fs_dirent_s *dir);
+static int     binfs_rewinddir(FAR struct inode *mountpt,
+                               FAR struct fs_dirent_s *dir);
+
+static int     binfs_bind(FAR struct inode *blkdriver, FAR const void *data,
+                          FAR void **handle);
+static int     binfs_unbind(FAR void *handle, FAR struct inode **blkdriver);
+static int     binfs_statfs(FAR struct inode *mountpt,
+                            FAR struct statfs *buf);
+
+static int     binfs_stat(FAR struct inode *mountpt, FAR const char *relpath,
+                          FAR struct stat *buf);
+
+/****************************************************************************
+ * Private Variables
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Variables
+ ****************************************************************************/
+
+/* See fs_mount.c -- this structure is explicitly externed there.
+ * We use the old-fashioned kind of initializers so that this will compile
+ * with any compiler.
+ */
+
+const struct mountpt_operations binfs_operations =
+{
+  binfs_open,        /* open */
+  binfs_close,       /* close */
+  binfs_read,        /* read */
+  NULL,              /* write */
+  NULL,              /* seek */
+  binfs_ioctl,       /* ioctl */
+
+  NULL,              /* sync */
+  binfs_dup,         /* dup */
+
+  binfs_opendir,     /* opendir */
+  NULL,              /* closedir */
+  binfs_readdir,     /* readdir */
+  binfs_rewinddir,   /* rewinddir */
+
+  binfs_bind,        /* bind */
+  binfs_unbind,      /* unbind */
+  binfs_statfs,      /* statfs */
+
+  NULL,              /* unlink */
+  NULL,              /* mkdir */
+  NULL,              /* rmdir */
+  NULL,              /* rename */
+  binfs_stat         /* stat */
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: binfs_open
+ ****************************************************************************/
+
+static int binfs_open(FAR struct file *filep, FAR const char *relpath,
+                      int oflags, mode_t mode)
+{
+  int index;
+
+  fvdbg("Open '%s'\n", relpath);
+
+  /* BINFS is read-only.  Any attempt to open with any kind of write
+   * access is not permitted.
+   */
+
+  if ((oflags & O_WRONLY) != 0 || (oflags & O_RDONLY) == 0)
+    {
+      fdbg("ERROR: Only O_RDONLY supported\n");
+      return -EACCES;
+    }
+
+  /* Check if the an entry exists with this name in the root directory.
+   * so the 'relpath' must be the name of the builtin function.
+   */
+
+  index = builtin_isavail(relpath);
+  if (index < 0)
+    {
+      fdbg("ERROR: Builting %s does not exist\n", relpath);
+      return -ENOENT;
+    }
+
+  /* Save the index as the open-specific state in filep->f_priv */
+
+  filep->f_priv = (FAR void *)index;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: binfs_close
+ ****************************************************************************/
+
+static int binfs_close(FAR struct file *filep)
+{
+  fvdbg("Closing\n");
+  return OK;
+}
+
+/****************************************************************************
+ * Name: binfs_read
+ ****************************************************************************/
+
+static ssize_t binfs_read(FAR struct file *filep, char *buffer, size_t buflen)
+{
+  /* Reading is not supported.  Just return end-of-file */
+
+  fvdbg("Read %d bytes from offset %d\n", buflen, filep->f_pos);
+  return 0;
+}
+
+/****************************************************************************
+ * Name: binfs_ioctl
+ ****************************************************************************/
+
+static int binfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
+{
+  int ret;
+
+  fvdbg("cmd: %d arg: %08lx\n", cmd, arg);
+
+  /* Only one IOCTL command is supported */
+
+  if (cmd == FIOC_FILENAME)
+    {
+      /* IN:  FAR char const ** pointer 
+       * OUT: Pointer to a persistent file name (Guaranteed to persist while
+       *      the file is open).
+       */
+
+      FAR const char **ptr = (FAR const char **)((uintptr_t)arg);
+      if (ptr == NULL)
+        {
+          ret = -EINVAL;
+        }
+      else
+        {
+          *ptr = g_builtins[(int)filep->f_priv].name;
+          ret = OK;
+        }
+    }
+  else
+    {
+      ret = -ENOTTY;
+    }
+
+  return ret;
+}
+
+/****************************************************************************
+ * Name: binfs_dup
+ *
+ * Description:
+ *   Duplicate open file data in the new file structure.
+ *
+ ****************************************************************************/
+
+static int binfs_dup(FAR const struct file *oldp, FAR struct file *newp)
+{
+  fvdbg("Dup %p->%p\n", oldp, newp);
+
+  /* Copy the index from the old to the new file structure */
+
+  newp->f_priv = oldp->f_priv;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: binfs_opendir
+ *
+ * Description:
+ *   Open a directory for read access
+ *
+ ****************************************************************************/
+
+static int binfs_opendir(struct inode *mountpt, const char *relpath,
+                         struct fs_dirent_s *dir)
+{
+  fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL");
+
+  /* The requested directory must be the volume-relative "root" directory */
+
+  if (relpath && relpath[0] != '\0')
+    {
+      return -ENOENT;
+    }
+
+  /* Set the index to the first entry */
+
+  dir->u.binfs.fb_index = 0;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: binfs_readdir
+ *
+ * Description: Read the next directory entry
+ *
+ ****************************************************************************/
+
+static int binfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
+{
+  unsigned int index;
+  int ret;
+
+  /* Have we reached the end of the directory */
+
+  index = dir->u.binfs.fb_index;
+  if (g_builtins[index].name == NULL)
+    {
+      /* We signal the end of the directory by returning the
+       * special error -ENOENT
+       */
+
+      fvdbg("Entry %d: End of directory\n", index);
+      ret = -ENOENT;
+    }
+  else
+    {
+      /* Save the filename and file type */
+
+      fvdbg("Entry %d: \"%s\"\n", index, g_builtins[index].name);
+      dir->fd_dir.d_type = DTYPE_FILE;
+      strncpy(dir->fd_dir.d_name, g_builtins[index].name, NAME_MAX+1);
+
+      /* The application list is terminated by an entry with a NULL name.
+       * Therefore, there is at least one more entry in the list.
+       */
+
+      index++;
+
+      /* Set up the next directory entry offset.  NOTE that we could use the
+       * standard f_pos instead of our own private fb_index.
+       */
+
+      dir->u.binfs.fb_index = index;
+      ret = OK;
+    }
+
+  return ret;
+}
+
+/****************************************************************************
+ * Name: binfs_rewindir
+ *
+ * Description: Reset directory read to the first entry
+ *
+ ****************************************************************************/
+
+static int binfs_rewinddir(struct inode *mountpt, struct fs_dirent_s *dir)
+{
+  fvdbg("Entry\n");
+
+  dir->u.binfs.fb_index = 0;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: binfs_bind
+ *
+ * Description: This implements a portion of the mount operation. This
+ *  function allocates and initializes the mountpoint private data and
+ *  binds the blockdriver inode to the filesystem private data.  The final
+ *  binding of the private data (containing the blockdriver) to the
+ *  mountpoint is performed by mount().
+ *
+ ****************************************************************************/
+
+static int binfs_bind(FAR struct inode *blkdriver, const void *data,
+                      void **handle)
+{
+  fvdbg("Entry\n");
+  return OK;
+}
+
+/****************************************************************************
+ * Name: binfs_unbind
+ *
+ * Description: This implements the filesystem portion of the umount
+ *   operation.
+ *
+ ****************************************************************************/
+
+static int binfs_unbind(void *handle, FAR struct inode **blkdriver)
+{
+  fvdbg("Entry\n");
+  return OK;
+}
+
+/****************************************************************************
+ * Name: binfs_statfs
+ *
+ * Description: Return filesystem statistics
+ *
+ ****************************************************************************/
+
+static int binfs_statfs(struct inode *mountpt, struct statfs *buf)
+{
+  fvdbg("Entry\n");
+
+  /* Fill in the statfs info */
+
+  memset(buf, 0, sizeof(struct statfs));
+  buf->f_type    = BINFS_MAGIC;
+  buf->f_bsize   = 0;
+  buf->f_blocks  = 0;
+  buf->f_bfree   = 0;
+  buf->f_bavail  = 0;
+  buf->f_namelen = NAME_MAX;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: binfs_stat
+ *
+ * Description: Return information about a file or directory
+ *
+ ****************************************************************************/
+
+static int binfs_stat(struct inode *mountpt, const char *relpath, struct stat *buf)
+{
+  fvdbg("Entry\n");
+
+  /* The requested directory must be the volume-relative "root" directory */
+
+  if (relpath && relpath[0] != '\0')
+    {
+      /* Check if there is a file with this name. */
+
+      if (builtin_isavail(relpath) < 0)
+        {
+          return -ENOENT;
+        }
+
+      /* It's a execute-only file name */
+
+      buf->st_mode = S_IFREG|S_IXOTH|S_IXGRP|S_IXUSR;
+    }
+  else
+    {
+      /* It's a read/execute-only directory name */
+
+      buf->st_mode = S_IFDIR|S_IROTH|S_IRGRP|S_IRUSR|S_IXOTH|S_IXGRP|S_IXUSR;
+    }
+
+  /* File/directory size, access block size */
+
+  buf->st_size    = 0;
+  buf->st_blksize = 0;
+  buf->st_blocks  = 0;
+  return OK;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+#endif /* !CONFIG_DISABLE_MOUNTPOINT && CONFIG_FS_BINFS */
+

fs/fat/Make.defs

@@ -1,7 +1,7 @@
 ############################################################################
 # Make.defs
 #
-#   Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008, 2011, 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,10 @@ CSRCS += fs_fat32.c fs_fat32dirent.c fs_fat32attrib.c fs_fat32util.c
 ASRCS +=
 CSRCS += fs_mkfatfs.c fs_configfat.c fs_writefat.c
 
-# Argument for dependency checking
+# Include FAT build support
+
+DEPPATH += --dep-path fat
+VPATH += :fat
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)fs$(DELIM)fat}
 
-FATDEPPATH = --dep-path fat
 endif

fs/fs_mount.c

@@ -1,7 +1,7 @@
 /****************************************************************************
  * fs/fs_mount.c
  *
- *   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,10 +47,6 @@
 
 #include <nuttx/fs/fs.h>
 
-#ifdef CONFIG_APPS_BINDIR
-#  include <apps/apps.h>
-#endif
-
 #include "fs_internal.h"
 
 /* At least one filesystem must be defined, or this file will not compile.
@@ -78,7 +74,7 @@
 
 /* These file systems do not require block drivers */
 
-#if defined(CONFIG_FS_NXFFS) || defined(CONFIG_APPS_BINDIR) || defined(CONFIG_NFS) 
+#if defined(CONFIG_FS_NXFFS) || defined(CONFIG_FS_BINFS) || defined(CONFIG_NFS) 
 #  define NONBDFS_SUPPORT
 #endif
 
@@ -123,6 +119,9 @@ extern const struct mountpt_operations nxffs_operations;
 #ifdef CONFIG_NFS
 extern const struct mountpt_operations nfs_operations;
 #endif
+#ifdef CONFIG_FS_BINFS
+extern const struct mountpt_operations binfs_operations;
+#endif
 
 static const struct fsmap_t g_nonbdfsmap[] =
 {
@@ -132,7 +131,7 @@ static const struct fsmap_t g_nonbdfsmap[] =
 #ifdef CONFIG_NFS
     { "nfs", &nfs_operations },
 #endif
-#ifdef CONFIG_APPS_BINDIR
+#ifdef CONFIG_FS_BINFS
     { "binfs", &binfs_operations },
 #endif
     { NULL,   NULL },

fs/mmap/Make.defs

@@ -1,7 +1,7 @@
 ############################################################################
 # fs/mmap/Make.defs
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,4 +40,9 @@ ifeq ($(CONFIG_FS_RAMMAP),y)
 CSRCS += fs_munmap.c fs_rammap.c
 endif
 
-MMAPDEPPATH = --dep-path mmap
+# Include MMAP build support
+
+DEPPATH += --dep-path mmap
+VPATH += :mmap
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)fs$(DELIM)mmap}
+

fs/nfs/Make.defs

@@ -1,7 +1,7 @@
 ############################################################################
 # Make.defs
 #
-#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,10 @@ CSRCS +=
 ASRCS +=
 CSRCS += rpc_clnt.c nfs_util.c nfs_vfsops.c
 
-# Argument for dependency checking
+# Include NFS build support
+
+DEPPATH += --dep-path nfs
+VPATH += :nfs
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)fs$(DELIM)nfs}
 
-NFSDEPPATH = --dep-path nfs
 endif

fs/nxffs/Make.defs

@@ -1,7 +1,7 @@
 ############################################################################
 # fs/nxffs/Make.defs
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,7 +40,10 @@ CSRCS += nxffs_block.c nxffs_blockstats.c nxffs_cache.c nxffs_dirent.c \
 		 nxffs_open.c nxffs_pack.c nxffs_read.c nxffs_reformat.c \
 		 nxffs_stat.c nxffs_unlink.c nxffs_util.c nxffs_write.c
 
-# Argument for dependency checking
+# Include NXFFS build support
+
+DEPPATH += --dep-path nxffs
+VPATH += :nxffs
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)fs$(DELIM)nxffs}
 
-NXFFSDEPPATH = --dep-path nxffs
 endif

fs/romfs/Make.defs

@@ -1,7 +1,7 @@
 ############################################################################
 # fs/romfs/Make.defs
 #
-#   Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008, 2011, 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,10 @@ ifeq ($(CONFIG_FS_ROMFS),y)
 ASRCS +=
 CSRCS += fs_romfs.c fs_romfsutil.c
 
-# Argument for dependency checking
+# Include ROMFS build support
+
+DEPPATH += --dep-path romfs
+VPATH += :romfs
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)fs$(DELIM)romfs}
 
-ROMFSDEPPATH = --dep-path romfs
 endif

include/nuttx/binfmt/builtin.h

@@ -0,0 +1,85 @@
+/****************************************************************************
+ * include/nuttx/binfmt/builtin.h
+ *
+ *   Copyright (C) 2011 Uros Platise. All rights reserved.
+ *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Authors: Uros Platise <uros.platise@isotel.eu>
+ *            Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __INCLUDE_NUTTX_BINFMT_BUILTIN_H
+#define __INCLUDE_NUTTX_BINFMT_BUILTIN_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <apps/apps.h>
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+struct builtin_s
+{
+  const char *name;         /* Invocation name and as seen under /sbin/ */
+  int         priority;     /* Use: SCHED_PRIORITY_DEFAULT */
+  int         stacksize;    /* Desired stack size */
+  main_t      main;         /* Entry point: main(int argc, char *argv[]) */
+};
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
+EXTERN const struct builtin_s g_builtins[];
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+EXTERN int number_builtins(void);
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __INCLUDE_NUTTX_BINFMT_BUILTIN_H */
+

include/nuttx/fs/binfs.h

@@ -44,6 +44,8 @@
 
 #include <nuttx/fs/ioctl.h>
 
+#ifdef CONFIG_FS_BINFS
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -62,7 +64,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Public Function Prototypes
+ * Public Data
  ****************************************************************************/
 
 #ifdef __cplusplus
@@ -72,9 +74,21 @@ extern "C" {
 #define EXTERN extern
 #endif
 
+/* The "bindir" is file system that supports access to the builtin applications.
+ * It is typically mounted under /bin.
+ */
+
+EXTERN mountpt_operations;
+EXTERN const struct mountpt_operations binfs_operations;
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
 #undef EXTERN
 #ifdef __cplusplus
 }
 #endif
 
+#endif /* CONFIG_FS_BINFS */
 #endif /* __INCLUDE_NUTTX_FS_BINFS_H */

include/nuttx/fs/dirent.h

@@ -1,7 +1,7 @@
 /****************************************************************************
  * include/nuttx/fs/dirent.h
  *
- *   Copyright (C) 2007, 2009, 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -102,7 +102,7 @@ struct fs_romfsdir_s
 };
 #endif /* CONFIG_FS_ROMFS */
 
-#ifdef CONFIG_APPS_BINDIR
+#ifdef CONFIG_FS_BINFS
 /* The apps/ pseudo bin/ directory.  The state value is simply an index */
 
 struct fs_binfsdir_s
@@ -179,7 +179,7 @@ struct fs_dirent_s
 #ifdef CONFIG_FS_ROMFS
       struct fs_romfsdir_s  romfs;
 #endif
-#ifdef CONFIG_APPS_BINDIR
+#ifdef CONFIG_FS_BINFS
       struct fs_binfsdir_s  binfs;
 #endif
 #ifdef CONFIG_FS_NXFFS

tools/mkconfig.c

@@ -1,7 +1,7 @@
 /****************************************************************************
  * tools/mkconfig.c
  *
- *   Copyright (C) 2007-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -213,14 +213,14 @@ int main(int argc, char **argv, char **envp)
   printf("# undef CONFIG_FS_FAT\n");
   printf("# undef CONFIG_FS_ROMFS\n");
   printf("# undef CONFIG_FS_NXFFS\n");
-  printf("# undef CONFIG_APPS_BINDIR\n");
+  printf("# undef CONFIG_FS_BINFS\n");
   printf("# undef CONFIG_NFS\n");
   printf("#endif\n\n");
   printf("/* Check if any readable and writable filesystem (OR USB storage) is supported */\n\n");
   printf("#undef CONFIG_FS_READABLE\n");
   printf("#undef CONFIG_FS_WRITABLE\n");
   printf("#if defined(CONFIG_FS_FAT) || defined(CONFIG_FS_ROMFS) || defined(CONFIG_USBMSC) || \\\n");
-  printf("    defined(CONFIG_FS_NXFFS) || defined(CONFIG_APPS_BINDIR) || defined(CONFIG_NFS)\n");
+  printf("    defined(CONFIG_FS_NXFFS) || defined(CONFIG_FS_BINFS) || defined(CONFIG_NFS)\n");
   printf("# define CONFIG_FS_READABLE 1\n");
   printf("#endif\n\n");
   printf("#if defined(CONFIG_FS_FAT) || defined(CONFIG_USBMSC) || defined(CONFIG_FS_NXFFS) || \\\n");