Implement redirection of output from NSH builtin commands to a file in a mounted volume

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

16 files changed, 1015 insertions, 690 deletions

diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index bf329a40d..ea4fcd07b 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -467,3 +467,5 @@
 	* apps/examples/ostest/waitpid.c:  Add a test for waitpid(), waitid(),
 	  and wait().
 	* builtin/binfs.c:  Add hooks for dup() method (not implemented).
+	* builtin/exec_builtin.c, nshlib/nsh_parse.c, and nshlib/nsh_builtin.c:
+	  NSH now supports re-direction of I/O to files (but still not from).
diff --git a/apps/builtin/Kconfig b/apps/builtin/Kconfig
index 5b262734d..1049712aa 100644
--- a/apps/builtin/Kconfig
+++ b/apps/builtin/Kconfig
@@ -27,4 +27,13 @@ if BUILTIN
 		however, to support execution of the builtin applications from BINFS as
 		well (via a binfmt/ loader).  However, that is down the road.
 
+config BUILTIN_PROXY_STACKSIZE
+	int "Builtin Proxy Stack Size"
+	default 1024
+	---help---
+		If exec_builting uses I/O redirection options, then it will require
+		an intermediary/proxy task to muck with the file descriptors.  This
+		configuration item specifies the stack size used for the proxy. Default:
+		1024 bytes.
+
 endif
diff --git a/apps/builtin/binfs.c b/apps/builtin/binfs.c
index 365021c7f..1fc2e7940 100644
--- a/apps/builtin/binfs.c
+++ b/apps/builtin/binfs.c
@@ -399,7 +399,7 @@ static int binfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
   /* Have we reached the end of the directory */
 
   index = dir->u.binfs.fb_index;
-  if (builtins[index].name == NULL)
+  if (g_builtins[index].name == NULL)
     {
       /* We signal the end of the directory by returning the
        * special error -ENOENT
@@ -412,9 +412,9 @@ static int binfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
     {
       /* Save the filename and file type */
 
-      fvdbg("Entry %d: \"%s\"\n", index, builtins[index].name);
+      fvdbg("Entry %d: \"%s\"\n", index, g_builtins[index].name);
       dir->fd_dir.d_type = DTYPE_FILE;
-      strncpy(dir->fd_dir.d_name, builtins[index].name, NAME_MAX+1);
+      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.
diff --git a/apps/builtin/builtin.c b/apps/builtin/builtin.c
index a6ed7dd3f..e0ae9888a 100644
--- a/apps/builtin/builtin.c
+++ b/apps/builtin/builtin.c
@@ -64,7 +64,7 @@ extern "C" {
 
 #include "builtin_proto.h"
 
-const struct builtin_s builtins[] =
+const struct builtin_s g_builtins[] =
 {
 # include "builtin_list.h"
   { NULL, 0, 0, 0 }
@@ -90,7 +90,7 @@ const struct builtin_s builtins[] =
 
 int number_builtins(void)
 {
-  return sizeof(builtins)/sizeof(struct builtin_s) - 1;
+  return sizeof(g_builtins)/sizeof(struct builtin_s) - 1;
 }
 
 
diff --git a/apps/builtin/builtin.h b/apps/builtin/builtin.h
index 3f7ddd7ce..4593809ee 100644
--- a/apps/builtin/builtin.h
+++ b/apps/builtin/builtin.h
@@ -60,7 +60,7 @@ extern "C" {
 #define EXTERN extern
 #endif
 
-EXTERN const struct builtin_s builtins[];
+EXTERN const struct builtin_s g_builtins[];
 
 /****************************************************************************
  * Public Functions
diff --git a/apps/builtin/exec_builtin.c b/apps/builtin/exec_builtin.c
index dc3630230..a3e79a945 100644
--- a/apps/builtin/exec_builtin.c
+++ b/apps/builtin/exec_builtin.c
@@ -1,13 +1,15 @@
 /****************************************************************************
  * apps/builtin/exec_builtin.c
  *
+ * Originally by:
+ *
  *   Copyright (C) 2011 Uros Platise. All rights reserved.
  *   Author: Uros Platise <uros.platise@isotel.eu>
  *
- * With updates, modifications, and general maintenance by:
+ * With subsequent updates, modifications, and general maintenance by:
  *
- *   Copyright (C) 2012 Gregory Nutt.  All rights reserved.
- *   Auther: Gregory Nutt <gnutt@nuttx.org>
+ *   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
  * modification, are permitted provided that the following conditions
@@ -43,18 +45,45 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <apps/apps.h>
-#include <sched.h>
 
+#include <sched.h>
 #include <string.h>
+#include <fcntl.h>
+#include <semaphore.h>
 #include <errno.h>
+#include <debug.h>
+
+#include <apps/apps.h>
 
 #include "builtin.h"
 
 /****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifndef CONFIG_BUILTIN_PROXY_STACKSIZE
+#  define CONFIG_BUILTIN_PROXY_STACKSIZE 1024
+#endif
+
+/****************************************************************************
  * Private Types
  ****************************************************************************/
 
+struct builtin_parms_s
+{
+  /* Input values */
+
+  FAR const char *redirfile;
+  FAR const char **argv;
+  int oflags;
+  int index;
+
+  /* Returned values */
+
+  pid_t result;
+  int errcode;
+};
+
 /****************************************************************************
  * Private Function Prototypes
  ****************************************************************************/
@@ -63,11 +92,277 @@
  * Private Data
  ****************************************************************************/
 
+static sem_t g_builtin_parmsem = SEM_INITIALIZER(1);
+static sem_t g_builtin_execsem = SEM_INITIALIZER(0);
+static struct builtin_parms_s g_builtin_parms;
+
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
 
 /****************************************************************************
+ * Name: bultin_semtake and builtin_semgive
+ *
+ * Description:
+ *   Give and take semaphores
+ *
+ * Input Parameters:
+ *
+ *   sem - The semaphore to act on.
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+static void bultin_semtake(FAR sem_t *sem)
+{
+  int ret;
+
+  do
+    {
+      ret = sem_wait(sem);
+      ASSERT(ret == 0 || errno == EINTR);
+    }
+  while (ret != 0);
+}
+
+#define builtin_semgive(sem) sem_post(sem)
+
+/****************************************************************************
+ * Name: builtin_taskcreate
+ *
+ * Description:
+ *   Execute the builtin task
+ *
+ * Returned Value:
+ *   On success, the task ID of the builtin task is returned; On failure, -1
+ *  (ERROR) is returned and the errno is set appropriately.
+ *
+ ****************************************************************************/
+
+static int builtin_taskcreate(int index, FAR const char **argv)
+{
+  int ret;
+
+  /* Disable pre-emption.  This means that although we start the builtin
+   * application here, it will not actually run until pre-emption is
+   * re-enabled below.
+   */
+
+  sched_lock();
+
+  /* Start the builtin application task */
+
+  ret = TASK_CREATE(g_builtins[index].name, g_builtins[index].priority,
+                    g_builtins[index].stacksize, g_builtins[index].main,
+                    (argv) ? &argv[1] : (FAR const char **)NULL);
+
+  /* If robin robin scheduling is enabled, then set the scheduling policy
+   * of the new task to SCHED_RR before it has a chance to run.
+   */
+
+#if CONFIG_RR_INTERVAL > 0
+  if (ret > 0)
+    {
+      struct sched_param param;
+
+      /* Pre-emption is disabled so the task creation and the
+       * following operation will be atomic.  The priority of the
+       * new task cannot yet have changed from its initial value.
+       */
+
+      param.sched_priority = g_builtins[index].priority;
+      (void)sched_setscheduler(ret, SCHED_RR, &param);
+    }
+#endif
+
+  /* Now let the builtin application run */
+
+  sched_unlock();
+
+  /* Return the task ID of the new task if the task was sucessfully
+   * started.  Otherwise, ret will be ERROR (and the errno value will
+   * be set appropriately).
+   */
+
+  return ret;
+}
+
+/****************************************************************************
+ * Name: builtin_proxy
+ *
+ * Description:
+ *   Perform output redirection, then execute the builtin task.
+ *
+ * Input Parameters:
+ *   Standard task start-up parameters
+ *
+ * Returned Value:
+ *   Standard task return value.
+ *
+ ****************************************************************************/
+
+static int builtin_proxy(int argc, char *argv[])
+{
+  int fd;
+  int ret = ERROR;
+
+  /* Open the output file for redirection */
+
+  svdbg("Open'ing redirfile=%s oflags=%04x mode=0644\n",
+        g_builtin_parms.redirfile, g_builtin_parms.oflags);
+
+  fd = open(g_builtin_parms.redirfile, g_builtin_parms.oflags, 0644);
+  if (fd < 0)
+    {
+      /* Remember the errno value.  ret is already set to ERROR */
+
+      g_builtin_parms.errcode = errno;
+      sdbg("ERROR: open of %s failed: %d\n",
+           g_builtin_parms.redirfile, g_builtin_parms.errcode);
+    }
+
+  /* Does the return file descriptor happen to match the required file
+   * desciptor number?
+   */
+
+  else if (fd != 1)
+    {
+      /* No.. dup2 to get the correct file number */
+
+      svdbg("Dup'ing %d->1\n", fd);
+
+      ret = dup2(fd, 1);
+      if (ret < 0)
+        {
+          g_builtin_parms.errcode = errno;
+          sdbg("ERROR: dup2 failed: %d\n", g_builtin_parms.errcode);
+        }
+
+      svdbg("Closing fd=%d\n", fd);
+      close(fd);
+    }
+
+  /* Was the setup successful? */
+
+  if (ret == OK)
+    {
+      /* Yes.. Start the task.  On success, the task ID of the builtin task
+       * is returned; On failure, -1 (ERROR) is returned and the errno
+       * is set appropriately.
+       */
+
+      ret = builtin_taskcreate(g_builtin_parms.index, g_builtin_parms.argv);
+      if (ret < 0)
+        {
+          g_builtin_parms.errcode = errno;
+          sdbg("ERROR: builtin_taskcreate failed: %d\n",
+               g_builtin_parms.errcode);
+        }
+    }
+
+  /* Post the semaphore to inform the parent task that we have completed
+   * what we need to do.
+   */
+
+  g_builtin_parms.result = ret;
+  builtin_semgive(&g_builtin_execsem);
+  return 0;
+}
+
+/****************************************************************************
+ * Name: builtin_startproxy
+ *
+ * Description:
+ *   Perform output redirection, then execute the builtin task.
+ *
+ * Input Parameters:
+ *   Standard task start-up parameters
+ *
+ * Returned Value:
+ *   On success, the task ID of the builtin task is returned; On failure, -1
+ *  (ERROR) is returned and the errno is set appropriately.
+ *
+ ****************************************************************************/
+
+static inline int builtin_startproxy(int index, FAR const char **argv,
+                                     FAR const char *redirfile, int oflags)
+{
+  struct sched_param param;
+  pid_t proxy;
+  int errcode;
+  int ret;
+
+  DEBUGASSERT(path);
+
+  svdbg("index=%d argv=%p redirfile=%s oflags=%04x\n",
+        index, argv, redirfile, oflags);
+
+  /* We will have to go through an intermediary/proxy task in order to
+   * perform the I/O redirection.  This would be a natural place to fork().
+   * However, true fork() behavior requires an MMU and most implementations
+   * of vfork() are not capable of these operations.
+   *
+   * Even without fork(), we can still do the job, but parameter passing is
+   * messier.  Unfortunately, there is no (clean) way to pass binary values
+   * as a task parameter, so we will use a semaphore-protected global
+   * structure.
+   */
+
+  /* Get exclusive access to the global parameter structure */
+
+  bultin_semtake(&g_builtin_parmsem);
+
+  /* Populate the parameter structure */
+
+  g_builtin_parms.redirfile = redirfile;
+  g_builtin_parms.argv      = argv;
+  g_builtin_parms.result    = ERROR;
+  g_builtin_parms.oflags    = oflags;
+  g_builtin_parms.index     = index;
+
+  /* Get the priority of this (parent) task */
+
+  ret = sched_getparam(0, &param);
+  if (ret < 0)
+    {
+      errcode = errno;
+      sdbg("ERROR: sched_getparam failed: %d\n", errcode);
+      goto errout;
+    }
+
+  /* Start the intermediary/proxy task at the same priority as the parent task. */
+
+  proxy = TASK_CREATE("builtin_proxy", param.sched_priority,
+                      CONFIG_BUILTIN_PROXY_STACKSIZE, (main_t)builtin_proxy,
+                      (FAR const char **)NULL);
+  if (proxy < 0)
+    {
+      errcode = errno;
+      sdbg("ERROR: Failed to start builtin_proxy: %d\n", errcode);
+      goto errout;
+    }
+
+   /* Wait for the proxy to complete its job.  We could use waitpid()
+    * for this.
+    */
+
+   bultin_semtake(&g_builtin_execsem);
+
+   /* Get the result and relinquish our access to the parameter structure */
+
+   set_errno(g_builtin_parms.errcode);
+   builtin_semgive(&g_builtin_parmsem);
+   return g_builtin_parms.result;
+
+errout:
+  set_errno(errcode);
+  builtin_semgive(&g_builtin_parmsem);
+  return ERROR;
+}
+
+/****************************************************************************
  * Public Functions
  ****************************************************************************/
 
@@ -86,10 +381,10 @@ const char *builtin_getname(int index)
    {
      return NULL;
    }
-    
-  return builtins[index].name;
+
+  return g_builtins[index].name;
 }
- 
+
 /****************************************************************************
  * Name: builtin_isavail
  *
@@ -102,10 +397,10 @@ const char *builtin_getname(int index)
 int builtin_isavail(FAR const char *appname)
 {
   int i;
-    
-  for (i = 0; builtins[i].name; i++) 
+
+  for (i = 0; g_builtins[i].name; i++)
     {
-      if (!strcmp(builtins[i].name, appname))
+      if (!strcmp(g_builtins[i].name, appname))
         {
           return i;
         }
@@ -114,74 +409,60 @@ int builtin_isavail(FAR const char *appname)
   set_errno(ENOENT);
   return ERROR;
 }
- 
+
 /****************************************************************************
- * Name: builtin_isavail
+ * Name: exec_builtin
  *
  * Description:
- *   Execute the application with name 'appname', providing the arguments
- *   in the argv[] array.
+ *   Executes builtin applications registered during 'make context' time.
+ *   New application is run in a separate task context (and thread).
+ *
+ * Input Parameter:
+ *   filename  - Name of the linked-in binary to be started.
+ *   argv      - Argument list
+ *   redirfile - If output if redirected, this parameter will be non-NULL
+ *               and will provide the full path to the file.
+ *   oflags    - If output is redirected, this parameter will provide the
+ *               open flags to use.  This will support file replacement
+ *               of appending to an existing file.
  *
  * Returned Value:
- *   On success, the task ID of the builtin application is returned.  On
- *   failure, -1 (ERROR) is returned an the errno value is set appropriately.
+ *   This is an end-user function, so it follows the normal convention:
+ *   Returns the PID of the exec'ed module.  On failure, it.returns
+ *   -1 (ERROR) and sets errno appropriately.
  *
  ****************************************************************************/
 
-int exec_builtin(FAR const char *appname, FAR const char **argv)
+int exec_builtin(FAR const char *appname, FAR const char **argv,
+                 FAR const char *redirfile, int oflags)
 {
-  pid_t pid;
   int index;
+  int ret = ERROR;
 
   /* Verify that an application with this name exists */
 
   index = builtin_isavail(appname);
   if (index >= 0)
     {
-      /* Disable pre-emption.  This means that although we start the builtin
-       * application here, it will not actually run until pre-emption is
-       * re-enabled below.
-       */
-
-      sched_lock();
-
-      /* Start the builtin application task */
+      /* Is output being redirected? */
 
-      pid = TASK_CREATE(builtins[index].name, builtins[index].priority, 
-                        builtins[index].stacksize, builtins[index].main, 
-                        (argv) ? &argv[1] : (const char **)NULL);
-
-      /* If robin robin scheduling is enabled, then set the scheduling policy
-       * of the new task to SCHED_RR before it has a chance to run.
-       */
-
-#if CONFIG_RR_INTERVAL > 0
-      if (pid > 0)
+      if (redirfile)
         {
-          struct sched_param param;
-
-          /* Pre-emption is disabled so the task creation and the
-           * following operation will be atomic.  The priority of the
-           * new task cannot yet have changed from its initial value.
-           */
-
-          param.sched_priority = builtins[index].priority;
-          sched_setscheduler(pid, SCHED_RR, &param);
+          ret = builtin_startproxy(index, argv, redirfile, oflags);
         }
-#endif
-      /* Now let the builtin application run */
-
-      sched_unlock();
-
-      /* Return the task ID of the new task if the task was sucessfully
-       * started.  Otherwise, pid will be ERROR (and the errno value will
-       * be set appropriately).
-       */
+      else
+        {
+          /* Start the builtin application task */
 
-      return pid;
+          ret = builtin_taskcreate(index, argv);
+        }
     }
 
-  /* Return ERROR with errno set appropriately */
 
-  return ERROR;
+  /* Return the task ID of the new task if the task was sucessfully
+   * started.  Otherwise, ret will be ERROR (and the errno value will
+   * be set appropriately).
+   */
+
+  return ret;
 }
diff --git a/apps/include/apps.h b/apps/include/apps.h
index 37599ac5c..f806d8aed 100644
--- a/apps/include/apps.h
+++ b/apps/include/apps.h
@@ -1,9 +1,16 @@
 /****************************************************************************
  * apps/include/apps.h
  *
- *   Copyright(C) 2011 Uros Platise. All rights reserved.
+ * Originally by:
+ *
+ *   Copyright (C) 2011 Uros Platise. All rights reserved.
  *   Author: Uros Platise <uros.platise@isotel.eu>
  *
+ * With subsequent updates, modifications, and general maintenance by:
+ *
+ *   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
  * modification, are permitted provided that the following conditions
  * are met:
@@ -64,27 +71,27 @@ struct builtin_s
  * Public Data
  ****************************************************************************/
 
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
 /* The "bindir" is file system that supports access to the builtin applications.
  * It is typically mounted under /bin.
  */
 
 #ifdef CONFIG_APPS_BINDIR
-struct mountpt_operations;
-extern const struct mountpt_operations binfs_operations;
+EXTERN mountpt_operations;
+EXTERN const struct mountpt_operations binfs_operations;
 #endif
 
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
 
-#undef EXTERN
-#if defined(__cplusplus)
-#define EXTERN extern "C"
-extern "C" {
-#else
-#define EXTERN extern
-#endif
-
 /****************************************************************************
  * Name: builtin_isavail
  *
@@ -129,8 +136,13 @@ EXTERN const char *builtin_getname(int index);
  *   New application is run in a separate task context (and thread).
  *
  * Input Parameter:
- *   filename - Name of the linked-in binary to be started.
- *   argv     - Argument list
+ *   filename  - Name of the linked-in binary to be started.
+ *   argv      - Argument list
+ *   redirfile - If output if redirected, this parameter will be non-NULL
+ *               and will provide the full path to the file.
+ *   oflags    - If output is redirected, this parameter will provide the
+ *               open flags to use.  This will support file replacement
+ *               of appending to an existing file.
  *
  * Returned Value:
  *   This is an end-user function, so it follows the normal convention:
@@ -139,7 +151,8 @@ EXTERN const char *builtin_getname(int index);
  *
  ****************************************************************************/
 
-EXTERN int exec_builtin(FAR const char *appname, FAR const char **argv);
+EXTERN int exec_builtin(FAR const char *appname, FAR const char **argv,
+                        FAR const char *redirfile, int oflags);
 
 #undef EXTERN
 #if defined(__cplusplus)
diff --git a/apps/nshlib/Makefile b/apps/nshlib/Makefile
index 7ddbb67bf..5c5269685 100644
--- a/apps/nshlib/Makefile
+++ b/apps/nshlib/Makefile
@@ -44,7 +44,7 @@ CSRCS = nsh_init.c nsh_parse.c nsh_console.c nsh_fscmds.c nsh_ddcmd.c \
 		nsh_proccmds.c nsh_mmcmds.c nsh_envcmds.c nsh_dbgcmds.c
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-CSRCS += nsh_apps.c
+CSRCS += nsh_builtin.c
 endif
 
 ifeq ($(CONFIG_NSH_ROMFSETC),y)
diff --git a/apps/nshlib/nsh.h b/apps/nshlib/nsh.h
index a046a384f..253a803f8 100644
--- a/apps/nshlib/nsh.h
+++ b/apps/nshlib/nsh.h
@@ -491,7 +491,8 @@ int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline);
 /* Application interface */
 
 #ifdef CONFIG_NSH_BUILTIN_APPS
-int nsh_execapp(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd, FAR char **argv);
+int nsh_builtin(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
+                FAR char **argv, FAR const char *redirfile, int oflags);
 #endif
 
 /* Working directory support */
diff --git a/apps/nshlib/nsh_apps.c b/apps/nshlib/nsh_builtin.c
index ea8791eef..16e3e9427 100644
--- a/apps/nshlib/nsh_apps.c
+++ b/apps/nshlib/nsh_builtin.c
@@ -1,10 +1,16 @@
 /****************************************************************************
- * apps/nshlib/nsh_apps.c
+ * apps/nshlib/nsh_builtin.c
+ *
+ * Originally by:
  *
- *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
  *   Copyright (C) 2011 Uros Platise. All rights reserved.
  *   Author: Uros Platise <uros.platise@isotel.eu>
  *
+ * With subsequent updates, modifications, and general maintenance by:
+ *
+ *   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:
@@ -84,7 +90,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nsh_execapp
+ * Name: nsh_builtin
  *
  * Description:
  *    Attempt to execute the application task whose name is 'cmd'
@@ -104,8 +110,8 @@
  *
  ****************************************************************************/
 
-int nsh_execapp(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
-                FAR char **argv)
+int nsh_builtin(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
+                FAR char **argv, FAR const char *redirfile, int oflags)
 {
   int ret = OK;
 
@@ -119,7 +125,7 @@ int nsh_execapp(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
    * applications.
    */
 
-  ret = exec_builtin(cmd, (FAR const char **)argv);
+  ret = exec_builtin(cmd, (FAR const char **)argv, redirfile, oflags);
   if (ret >= 0)
     {
       /* The application was successfully started (but still blocked because
@@ -191,7 +197,7 @@ int nsh_execapp(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
 #if !defined(CONFIG_SCHED_WAITPID) || !defined(CONFIG_NSH_DISABLEBG)
         {
           struct sched_param param;
-          sched_getparam(0, &param);
+          sched_getparam(ret, &param);
           nsh_output(vtbl, "%s [%d:%d]\n", cmd, ret, param.sched_priority);
 
           /* Backgrounded commands always 'succeed' as long as we can start
@@ -205,13 +211,13 @@ int nsh_execapp(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
 
   sched_unlock();
 
-  /* If exec_builtin() or waitpid() failed, then return the negated errno
-   * value.
+  /* If exec_builtin() or waitpid() failed, then return -1 (ERROR) with the
+   * errno value set appropriately.
    */
 
   if (ret < 0)
     {
-      return -errno;
+      return ERROR;
     }
 
   return ret;
diff --git a/apps/nshlib/nsh_codeccmd.c b/apps/nshlib/nsh_codeccmd.c
index 8c1f5adbd..779fc5ecd 100644
--- a/apps/nshlib/nsh_codeccmd.c
+++ b/apps/nshlib/nsh_codeccmd.c
@@ -1,538 +1,538 @@
-/****************************************************************************

- * apps/nshlib/nsh_apps.c

- *

- * This file is part of NuttX, contributed by Darcy Gong

- *

- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.

- *   Author: Darcy Gong 2012-10-30

- *

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

-#ifdef CONFIG_NETUTILS_CODECS

-

-#include <sys/stat.h>

-#include <stdint.h>

-#include <stdbool.h>

-#include <stdio.h>

-#include <stdlib.h>

-#include <unistd.h>

-#include <string.h>

-#include <sched.h>

-#include <fcntl.h>

-#include <libgen.h>

-#include <errno.h>

-#include <debug.h>

-

-#if defined(CONFIG_NSH_DISABLE_URLENCODE) && defined(CONFIG_NSH_DISABLE_URLDECODE)

-#  undef CONFIG_CODECS_URLCODE

-#endif

-

-#ifdef CONFIG_CODECS_URLCODE

-#include <apps/netutils/urldecode.h>

-#endif

-

-#if defined(CONFIG_NSH_DISABLE_BASE64ENC) && defined(CONFIG_NSH_DISABLE_BASE64ENC)

-#  undef CONFIG_CODECS_BASE64

-#endif

-

-#ifdef CONFIG_CODECS_BASE64

-#include <apps/netutils/base64.h>

-#endif

-

-#if defined(CONFIG_CODECS_HASH_MD5) && !defined(CONFIG_NSH_DISABLE_MD5)

-#include <apps/netutils/md5.h>

-#endif

-

-#include "nsh.h"

-#include "nsh_console.h"

-

-/****************************************************************************

- * Pre-processor Definitions

- ****************************************************************************/

-

-#ifndef CONFIG_NSH_CODECS_BUFSIZE

-#  define CONFIG_NSH_CODECS_BUFSIZE    128

-#endif

-

-#define CODEC_MODE_URLENCODE  1

-#define CODEC_MODE_URLDECODE  2

-#define CODEC_MODE_BASE64ENC  3

-#define CODEC_MODE_BASE64DEC  4

-#define CODEC_MODE_HASH_MD5   5

-

-/****************************************************************************

- * Private Types

- ****************************************************************************/

-

-typedef void (*codec_callback_t)(FAR char *src_buff, int src_buff_len,

-                                 FAR char *dst_buff, FAR int *dst_buff_len,

-                                 int mode);

-

-/****************************************************************************

- * Private Functions

- ****************************************************************************/

-

-/****************************************************************************

- * Name: urlencode_cb

- ****************************************************************************/

-

-#if defined(CONFIG_CODECS_URLCODE) && !defined(CONFIG_NSH_DISABLE_URLENCODE)

-static void urlencode_cb(FAR char *src_buff, int src_buff_len,

-                         FAR char *dst_buff, FAR int *dst_buff_len, int mode)

-{

-  urlencode(src_buff,src_buff_len,dst_buff,dst_buff_len);

-}

-#endif

-

-/****************************************************************************

- * Name: urldecode_cb

- ****************************************************************************/

-

-#if defined(CONFIG_CODECS_URLCODE) && !defined(CONFIG_NSH_DISABLE_URLDECODE)

-static void urldecode_cb(FAR char *src_buff, int src_buff_len, FAR char *dst_buff,

-                         FAR int *dst_buff_len, int mode)

-{

-  urldecode(src_buff,src_buff_len,dst_buff,dst_buff_len);

-}

-#endif

-

-/****************************************************************************

- * Name: b64enc_cb

- ****************************************************************************/

-

-#if defined(CONFIG_CODECS_BASE64) && !defined(CONFIG_NSH_DISABLE_BASE64ENC)

-static void b64enc_cb(FAR char *src_buff, int src_buff_len, FAR char *dst_buff,

-                      FAR int *dst_buff_len, int mode)

-{

-  if (mode == 0)

-    {

-      //dst_buff =

-      base64_encode((unsigned char *)src_buff, src_buff_len,

-                    (unsigned char *)dst_buff, (size_t *)dst_buff_len);

-    }

-  else

-    {

-      //dst_buff =

-      base64w_encode((unsigned char *)src_buff, src_buff_len,

-                     (unsigned char *)dst_buff, (size_t *)dst_buff_len);

-    }

-}

-#endif

-

-/****************************************************************************

- * Name: b64dec_cb

- ****************************************************************************/

-

-#if defined(CONFIG_CODECS_BASE64) && !defined(CONFIG_NSH_DISABLE_BASE64DEC)

-static void b64dec_cb(FAR char *src_buff, int src_buff_len, FAR char *dst_buff,

-                      FAR int *dst_buff_len, int mode)

-{

-  if (mode == 0)

-    {

-      //dst_buff =

-      base64_decode((unsigned char *)src_buff, src_buff_len,

-                    (unsigned char *)dst_buff, (size_t *)dst_buff_len);

-    }

-  else

-    {

-      //dst_buff =

-      base64w_decode((unsigned char *)src_buff, src_buff_len,

-                     (unsigned char *)dst_buff,(size_t *)dst_buff_len);

-    }

-}

-#endif

-

-/****************************************************************************

- * Name: md5_cb

- ****************************************************************************/

-

-#if defined(CONFIG_CODECS_HASH_MD5) && !defined(CONFIG_NSH_DISABLE_MD5)

-static void md5_cb(FAR char *src_buff, int src_buff_len, FAR char *dst_buff,

-                   FAR int *dst_buff_len, int mode)

-{

-  MD5Update((MD5_CTX *)dst_buff, (unsigned char *)src_buff, src_buff_len);

-}

-#endif

-

-/****************************************************************************

- * Name: calc_codec_buffsize

- ****************************************************************************/

-

-static int calc_codec_buffsize(int src_buffsize, uint8_t mode)

-{

-  switch (mode)

-  {

-  case CODEC_MODE_URLENCODE:

-    return src_buffsize*3+1;

-  case CODEC_MODE_URLDECODE:

-    return src_buffsize+1;

-  case CODEC_MODE_BASE64ENC:

-    return ((src_buffsize + 2)/ 3 * 4)+1;

-  case CODEC_MODE_BASE64DEC:

-    return (src_buffsize / 4 * 3 + 2)+1;

-  case CODEC_MODE_HASH_MD5:

-    return 32+1;

-  default:

-    return src_buffsize+1;

-  }

-}

-

-/****************************************************************************

- * Name: cmd_codecs_proc

- ****************************************************************************/

-

-static int cmd_codecs_proc(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv,

-                           uint8_t mode, codec_callback_t func)

-{

-#if defined(CONFIG_CODECS_HASH_MD5) && !defined(CONFIG_NSH_DISABLE_MD5)

-  static const unsigned char hex_chars[] = "0123456789abcdef";

-  MD5_CTX ctx;

-  unsigned char mac[16];

-  char *pSrc;

-  char *pDest;

-#endif

-

-  char *localfile = NULL;

-  char *src_buffer = NULL;

-  char *buffer = NULL;

-  char *fullpath = NULL;

-  const char *fmt;

-  char *s_data;

-  bool badarg = false;

-  bool is_file = false;

-  bool is_websafe=false;

-  int option;

-  int fd = -1;

-  int buff_len = 0;

-  int src_buff_len = 0;

-  int i = 0;

-  int ret = OK;

-

-  /* Get the command options */

-

-  while ((option = getopt(argc, argv, ":fw")) != ERROR)

-    {

-      switch (option)

-        {

-          case 'f':

-            is_file = true;

-            break;

-

-#ifdef CONFIG_CODECS_BASE64

-          case 'w':

-            is_websafe = true;

-

-            if (!(mode == CODEC_MODE_BASE64ENC || mode == CODEC_MODE_BASE64DEC))

-              {

-                badarg = true;

-              }

-            break;

-#endif

-          case ':':

-            nsh_output(vtbl, g_fmtargrequired, argv[0]);

-            badarg = true;

-            break;

-

-          case '?':

-          default:

-            nsh_output(vtbl, g_fmtarginvalid, argv[0]);

-            badarg = true;

-            break;

-        }

-    }

-

-  /* If a bad argument was encountered, then return without processing the command */

-

-  if (badarg)

-    {

-      return ERROR;

-    }

-

-  /* There should be exactly on parameter left on the command-line */

-

-  if (optind == argc-1)

-    {

-      s_data = argv[optind];

-    }

-  else if (optind >= argc)

-    {

-      fmt = g_fmttoomanyargs;

-      goto errout;

-    }

-  else

-    {

-      fmt = g_fmtargrequired;

-      goto errout;

-    }

-

-#if defined(CONFIG_CODECS_HASH_MD5) && !defined(CONFIG_NSH_DISABLE_MD5)

-  if (mode == CODEC_MODE_HASH_MD5)

-    {

-      MD5Init(&ctx);

-    }

-#endif

-

-  if (is_file)

-    {

-      /* Get the local file name */

-

-      localfile = s_data;

-

-      /* Get the full path to the local file */

-

-      fullpath = nsh_getfullpath(vtbl, localfile);

-

-      /* Open the local file for writing */

-

-      fd = open(fullpath, O_RDONLY|O_TRUNC, 0644);

-      if (fd < 0)

-        {

-          nsh_output(vtbl, g_fmtcmdfailed, argv[0], "open", NSH_ERRNO);

-          ret = ERROR;

-          goto exit;

-        }

-

-      src_buffer = malloc(CONFIG_NSH_CODECS_BUFSIZE+2);

-#if defined(CONFIG_CODECS_BASE64) && !defined(CONFIG_NSH_DISABLE_BASE64ENC)

-      if (mode == CODEC_MODE_BASE64ENC)

-        {

-          src_buff_len = CONFIG_NSH_CODECS_BUFSIZE / 3 * 3;

-        }

-      else

-#endif

-        {

-          src_buff_len = CONFIG_NSH_CODECS_BUFSIZE;

-        }

-

-      buff_len = calc_codec_buffsize(src_buff_len+2, mode);

-      buffer = malloc(buff_len);

-      while(true)

-        {

-          memset(src_buffer, 0, src_buff_len+2);

-          ret=read(fd, src_buffer, src_buff_len);

-          if (ret < 0)

-            {

-              nsh_output(vtbl, g_fmtcmdfailed, argv[0], "read", NSH_ERRNO);

-              ret = ERROR;

-              goto exit;

-            }

-          else if(ret==0)

-            {

-              break;

-            }

-

-#if defined(CONFIG_CODECS_URLCODE) && !defined(CONFIG_NSH_DISABLE_URLDECODE)

-          if (mode == CODEC_MODE_URLDECODE)

-            {

-              if (src_buffer[src_buff_len-1]=='%')

-                {

-                  ret += read(fd,&src_buffer[src_buff_len],2);

-                }

-              else if (src_buffer[src_buff_len-2]=='%')

-                {

-                  ret += read(fd,&src_buffer[src_buff_len],1);

-                }

-            }

-#endif

-          memset(buffer, 0, buff_len);

-          if (func)

-            {

-#if defined(CONFIG_CODECS_HASH_MD5) && !defined(CONFIG_NSH_DISABLE_MD5)

-              if (mode == CODEC_MODE_HASH_MD5)

-                {

-                  func(src_buffer, ret, (char *)&ctx, &buff_len,0);

-                }

-              else

-#endif

-                {

-                  func(src_buffer, ret, buffer, &buff_len,(is_websafe)?1:0);

-                  nsh_output(vtbl, "%s", buffer);

-                }

-            }

-

-          buff_len = calc_codec_buffsize(src_buff_len+2, mode);

-        }

-

-#if defined(CONFIG_CODECS_HASH_MD5) && !defined(CONFIG_NSH_DISABLE_MD5)

-      if (mode == CODEC_MODE_HASH_MD5)

-        {

-          MD5Final(mac, &ctx);

-          pSrc = (char *)&mac;

-          pDest = buffer;

-          for(i=0;i<16;i++,pSrc++)

-            {

-              *pDest++ = hex_chars[(*pSrc) >> 4];

-              *pDest++ = hex_chars[(*pSrc) & 0x0f];

-            }

-

-          *pDest='\0';

-          nsh_output(vtbl, "%s\n", buffer);

-        }

-#endif

-      ret = OK;

-      goto exit;

-    }

-  else

-    {

-      src_buffer = s_data;

-      src_buff_len = strlen(s_data);

-      buff_len = calc_codec_buffsize(src_buff_len, mode);

-      buffer = malloc(buff_len);

-      buffer[0]=0;

-      if (!buffer)

-        {

-          fmt = g_fmtcmdoutofmemory;

-          goto errout;

-        }

-

-      memset(buffer, 0, buff_len);

-      if (func)

-        {

-#if defined(CONFIG_CODECS_HASH_MD5) && !defined(CONFIG_NSH_DISABLE_MD5)

-          if (mode == CODEC_MODE_HASH_MD5)

-            {

-              func(src_buffer, src_buff_len, (char *)&ctx, &buff_len, 0);

-              MD5Final(mac, &ctx);

-              pSrc = (char *)&mac;

-              pDest = buffer;

-              for(i=0;i<16;i++,pSrc++)

-                {

-                  *pDest++ = hex_chars[(*pSrc) >> 4];

-                  *pDest++ = hex_chars[(*pSrc) & 0x0f];

-                }

-

-              *pDest='\0';

-            }

-          else

-#endif

-            {

-              func(src_buffer, src_buff_len, buffer, &buff_len,(is_websafe)?1:0);

-            }

-        }

-

-      nsh_output(vtbl, "%s\n",buffer);

-      src_buffer = NULL;

-      goto exit;

-    }

-

-exit:

-  if (fd >= 0)

-    {

-      close(fd);

-    }

-

-  if (fullpath)

-    {

-      free(fullpath);

-    }

-

-  if (src_buffer)

-    {

-      free(src_buffer);

-    }

-

-  if (buffer)

-    {

-      free(buffer);

-    }

-

-  return ret;

-

-errout:

-  nsh_output(vtbl, fmt, argv[0]);

-  ret = ERROR;

-  goto exit;

-}

-

-/****************************************************************************

- * Public Functions

- ****************************************************************************/

-

-/****************************************************************************

- * Name: cmd_urlencode

- ****************************************************************************/

-

-#if defined(CONFIG_CODECS_URLCODE) && !defined(CONFIG_NSH_DISABLE_URLENCODE)

-int cmd_urlencode(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)

-{

-  return cmd_codecs_proc(vtbl, argc, argv, CODEC_MODE_URLENCODE, urlencode_cb);

-}

-#endif

-

-/****************************************************************************

- * Name: cmd_urldecode

- ****************************************************************************/

-

-#if defined(CONFIG_CODECS_URLCODE) && !defined(CONFIG_NSH_DISABLE_URLDECODE)

-int cmd_urldecode(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)

-{

-  return cmd_codecs_proc(vtbl, argc, argv, CODEC_MODE_URLDECODE, urldecode_cb);

-}

-#endif

-

-/****************************************************************************

- * Name: cmd_base64encode

- ****************************************************************************/

-

-#if defined(CONFIG_CODECS_BASE64) && !defined(CONFIG_NSH_DISABLE_BASE64ENC)

-int cmd_base64encode(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)

-{

-  return cmd_codecs_proc(vtbl, argc, argv, CODEC_MODE_BASE64ENC, b64enc_cb);

-}

-#endif

-

-/****************************************************************************

- * Name: cmd_base64decode

- ****************************************************************************/

-

-#if defined(CONFIG_CODECS_BASE64) && !defined(CONFIG_NSH_DISABLE_BASE64DEC)

-int cmd_base64decode(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)

-{

-  return cmd_codecs_proc(vtbl, argc, argv, CODEC_MODE_BASE64DEC, b64dec_cb);

-}

-#endif

-

-/****************************************************************************

- * Name: cmd_md5

- ****************************************************************************/

-

-#if defined(CONFIG_CODECS_HASH_MD5) && !defined(CONFIG_NSH_DISABLE_MD5)

-int cmd_md5(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)

-{

-  return cmd_codecs_proc(vtbl,argc,argv,CODEC_MODE_HASH_MD5,md5_cb);

-}

-#endif

-

-#endif /* CONFIG_NETUTILS_CODECS */

+/****************************************************************************
+ * apps/nshlib/nsh_codeccmd.c
+ *
+ * This file is part of NuttX, contributed by Darcy Gong
+ *
+ *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Author: Darcy Gong 2012-10-30
+ *
+ * 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>
+#ifdef CONFIG_NETUTILS_CODECS
+
+#include <sys/stat.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <sched.h>
+#include <fcntl.h>
+#include <libgen.h>
+#include <errno.h>
+#include <debug.h>
+
+#if defined(CONFIG_NSH_DISABLE_URLENCODE) && defined(CONFIG_NSH_DISABLE_URLDECODE)
+#  undef CONFIG_CODECS_URLCODE
+#endif
+
+#ifdef CONFIG_CODECS_URLCODE
+#include <apps/netutils/urldecode.h>
+#endif
+
+#if defined(CONFIG_NSH_DISABLE_BASE64ENC) && defined(CONFIG_NSH_DISABLE_BASE64ENC)
+#  undef CONFIG_CODECS_BASE64
+#endif
+
+#ifdef CONFIG_CODECS_BASE64
+#include <apps/netutils/base64.h>
+#endif
+
+#if defined(CONFIG_CODECS_HASH_MD5) && !defined(CONFIG_NSH_DISABLE_MD5)
+#include <apps/netutils/md5.h>
+#endif
+
+#include "nsh.h"
+#include "nsh_console.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifndef CONFIG_NSH_CODECS_BUFSIZE
+#  define CONFIG_NSH_CODECS_BUFSIZE    128
+#endif
+
+#define CODEC_MODE_URLENCODE  1
+#define CODEC_MODE_URLDECODE  2
+#define CODEC_MODE_BASE64ENC  3
+#define CODEC_MODE_BASE64DEC  4
+#define CODEC_MODE_HASH_MD5   5
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+typedef void (*codec_callback_t)(FAR char *src_buff, int src_buff_len,
+                                 FAR char *dst_buff, FAR int *dst_buff_len,
+                                 int mode);
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: urlencode_cb
+ ****************************************************************************/
+
+#if defined(CONFIG_CODECS_URLCODE) && !defined(CONFIG_NSH_DISABLE_URLENCODE)
+static void urlencode_cb(FAR char *src_buff, int src_buff_len,
+                         FAR char *dst_buff, FAR int *dst_buff_len, int mode)
+{
+  urlencode(src_buff,src_buff_len,dst_buff,dst_buff_len);
+}
+#endif
+
+/****************************************************************************
+ * Name: urldecode_cb
+ ****************************************************************************/
+
+#if defined(CONFIG_CODECS_URLCODE) && !defined(CONFIG_NSH_DISABLE_URLDECODE)
+static void urldecode_cb(FAR char *src_buff, int src_buff_len, FAR char *dst_buff,
+                         FAR int *dst_buff_len, int mode)
+{
+  urldecode(src_buff,src_buff_len,dst_buff,dst_buff_len);
+}
+#endif
+
+/****************************************************************************
+ * Name: b64enc_cb
+ ****************************************************************************/
+
+#if defined(CONFIG_CODECS_BASE64) && !defined(CONFIG_NSH_DISABLE_BASE64ENC)
+static void b64enc_cb(FAR char *src_buff, int src_buff_len, FAR char *dst_buff,
+                      FAR int *dst_buff_len, int mode)
+{
+  if (mode == 0)
+    {
+      //dst_buff =
+      base64_encode((unsigned char *)src_buff, src_buff_len,
+                    (unsigned char *)dst_buff, (size_t *)dst_buff_len);
+    }
+  else
+    {
+      //dst_buff =
+      base64w_encode((unsigned char *)src_buff, src_buff_len,
+                     (unsigned char *)dst_buff, (size_t *)dst_buff_len);
+    }
+}
+#endif
+
+/****************************************************************************
+ * Name: b64dec_cb
+ ****************************************************************************/
+
+#if defined(CONFIG_CODECS_BASE64) && !defined(CONFIG_NSH_DISABLE_BASE64DEC)
+static void b64dec_cb(FAR char *src_buff, int src_buff_len, FAR char *dst_buff,
+                      FAR int *dst_buff_len, int mode)
+{
+  if (mode == 0)
+    {
+      //dst_buff =
+      base64_decode((unsigned char *)src_buff, src_buff_len,
+                    (unsigned char *)dst_buff, (size_t *)dst_buff_len);
+    }
+  else
+    {
+      //dst_buff =
+      base64w_decode((unsigned char *)src_buff, src_buff_len,
+                     (unsigned char *)dst_buff,(size_t *)dst_buff_len);
+    }
+}
+#endif
+
+/****************************************************************************
+ * Name: md5_cb
+ ****************************************************************************/
+
+#if defined(CONFIG_CODECS_HASH_MD5) && !defined(CONFIG_NSH_DISABLE_MD5)
+static void md5_cb(FAR char *src_buff, int src_buff_len, FAR char *dst_buff,
+                   FAR int *dst_buff_len, int mode)
+{
+  MD5Update((MD5_CTX *)dst_buff, (unsigned char *)src_buff, src_buff_len);
+}
+#endif
+
+/****************************************************************************
+ * Name: calc_codec_buffsize
+ ****************************************************************************/
+
+static int calc_codec_buffsize(int src_buffsize, uint8_t mode)
+{
+  switch (mode)
+  {
+  case CODEC_MODE_URLENCODE:
+    return src_buffsize*3+1;
+  case CODEC_MODE_URLDECODE:
+    return src_buffsize+1;
+  case CODEC_MODE_BASE64ENC:
+    return ((src_buffsize + 2)/ 3 * 4)+1;
+  case CODEC_MODE_BASE64DEC:
+    return (src_buffsize / 4 * 3 + 2)+1;
+  case CODEC_MODE_HASH_MD5:
+    return 32+1;
+  default:
+    return src_buffsize+1;
+  }
+}
+
+/****************************************************************************
+ * Name: cmd_codecs_proc
+ ****************************************************************************/
+
+static int cmd_codecs_proc(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv,
+                           uint8_t mode, codec_callback_t func)
+{
+#if defined(CONFIG_CODECS_HASH_MD5) && !defined(CONFIG_NSH_DISABLE_MD5)
+  static const unsigned char hex_chars[] = "0123456789abcdef";
+  MD5_CTX ctx;
+  unsigned char mac[16];
+  char *pSrc;
+  char *pDest;
+#endif
+
+  char *localfile = NULL;
+  char *src_buffer = NULL;
+  char *buffer = NULL;
+  char *fullpath = NULL;
+  const char *fmt;
+  char *s_data;
+  bool badarg = false;
+  bool is_file = false;
+  bool is_websafe=false;
+  int option;
+  int fd = -1;
+  int buff_len = 0;
+  int src_buff_len = 0;
+  int i = 0;
+  int ret = OK;
+
+  /* Get the command options */
+
+  while ((option = getopt(argc, argv, ":fw")) != ERROR)
+    {
+      switch (option)
+        {
+          case 'f':
+            is_file = true;
+            break;
+
+#ifdef CONFIG_CODECS_BASE64
+          case 'w':
+            is_websafe = true;
+
+            if (!(mode == CODEC_MODE_BASE64ENC || mode == CODEC_MODE_BASE64DEC))
+              {
+                badarg = true;
+              }
+            break;
+#endif
+          case ':':
+            nsh_output(vtbl, g_fmtargrequired, argv[0]);
+            badarg = true;
+            break;
+
+          case '?':
+          default:
+            nsh_output(vtbl, g_fmtarginvalid, argv[0]);
+            badarg = true;
+            break;
+        }
+    }
+
+  /* If a bad argument was encountered, then return without processing the command */
+
+  if (badarg)
+    {
+      return ERROR;
+    }
+
+  /* There should be exactly on parameter left on the command-line */
+
+  if (optind == argc-1)
+    {
+      s_data = argv[optind];
+    }
+  else if (optind >= argc)
+    {
+      fmt = g_fmttoomanyargs;
+      goto errout;
+    }
+  else
+    {
+      fmt = g_fmtargrequired;
+      goto errout;
+    }
+
+#if defined(CONFIG_CODECS_HASH_MD5) && !defined(CONFIG_NSH_DISABLE_MD5)
+  if (mode == CODEC_MODE_HASH_MD5)
+    {
+      MD5Init(&ctx);
+    }
+#endif
+
+  if (is_file)
+    {
+      /* Get the local file name */
+
+      localfile = s_data;
+
+      /* Get the full path to the local file */
+
+      fullpath = nsh_getfullpath(vtbl, localfile);
+
+      /* Open the local file for writing */
+
+      fd = open(fullpath, O_RDONLY|O_TRUNC, 0644);
+      if (fd < 0)
+        {
+          nsh_output(vtbl, g_fmtcmdfailed, argv[0], "open", NSH_ERRNO);
+          ret = ERROR;
+          goto exit;
+        }
+
+      src_buffer = malloc(CONFIG_NSH_CODECS_BUFSIZE+2);
+#if defined(CONFIG_CODECS_BASE64) && !defined(CONFIG_NSH_DISABLE_BASE64ENC)
+      if (mode == CODEC_MODE_BASE64ENC)
+        {
+          src_buff_len = CONFIG_NSH_CODECS_BUFSIZE / 3 * 3;
+        }
+      else
+#endif
+        {
+          src_buff_len = CONFIG_NSH_CODECS_BUFSIZE;
+        }
+
+      buff_len = calc_codec_buffsize(src_buff_len+2, mode);
+      buffer = malloc(buff_len);
+      while(true)
+        {
+          memset(src_buffer, 0, src_buff_len+2);
+          ret=read(fd, src_buffer, src_buff_len);
+          if (ret < 0)
+            {
+              nsh_output(vtbl, g_fmtcmdfailed, argv[0], "read", NSH_ERRNO);
+              ret = ERROR;
+              goto exit;
+            }
+          else if(ret==0)
+            {
+              break;
+            }
+
+#if defined(CONFIG_CODECS_URLCODE) && !defined(CONFIG_NSH_DISABLE_URLDECODE)
+          if (mode == CODEC_MODE_URLDECODE)
+            {
+              if (src_buffer[src_buff_len-1]=='%')
+                {
+                  ret += read(fd,&src_buffer[src_buff_len],2);
+                }
+              else if (src_buffer[src_buff_len-2]=='%')
+                {
+                  ret += read(fd,&src_buffer[src_buff_len],1);
+                }
+            }
+#endif
+          memset(buffer, 0, buff_len);
+          if (func)
+            {
+#if defined(CONFIG_CODECS_HASH_MD5) && !defined(CONFIG_NSH_DISABLE_MD5)
+              if (mode == CODEC_MODE_HASH_MD5)
+                {
+                  func(src_buffer, ret, (char *)&ctx, &buff_len,0);
+                }
+              else
+#endif
+                {
+                  func(src_buffer, ret, buffer, &buff_len,(is_websafe)?1:0);
+                  nsh_output(vtbl, "%s", buffer);
+                }
+            }
+
+          buff_len = calc_codec_buffsize(src_buff_len+2, mode);
+        }
+
+#if defined(CONFIG_CODECS_HASH_MD5) && !defined(CONFIG_NSH_DISABLE_MD5)
+      if (mode == CODEC_MODE_HASH_MD5)
+        {
+          MD5Final(mac, &ctx);
+          pSrc = (char *)&mac;
+          pDest = buffer;
+          for(i=0;i<16;i++,pSrc++)
+            {
+              *pDest++ = hex_chars[(*pSrc) >> 4];
+              *pDest++ = hex_chars[(*pSrc) & 0x0f];
+            }
+
+          *pDest='\0';
+          nsh_output(vtbl, "%s\n", buffer);
+        }
+#endif
+      ret = OK;
+      goto exit;
+    }
+  else
+    {
+      src_buffer = s_data;
+      src_buff_len = strlen(s_data);
+      buff_len = calc_codec_buffsize(src_buff_len, mode);
+      buffer = malloc(buff_len);
+      buffer[0]=0;
+      if (!buffer)
+        {
+          fmt = g_fmtcmdoutofmemory;
+          goto errout;
+        }
+
+      memset(buffer, 0, buff_len);
+      if (func)
+        {
+#if defined(CONFIG_CODECS_HASH_MD5) && !defined(CONFIG_NSH_DISABLE_MD5)
+          if (mode == CODEC_MODE_HASH_MD5)
+            {
+              func(src_buffer, src_buff_len, (char *)&ctx, &buff_len, 0);
+              MD5Final(mac, &ctx);
+              pSrc = (char *)&mac;
+              pDest = buffer;
+              for(i=0;i<16;i++,pSrc++)
+                {
+                  *pDest++ = hex_chars[(*pSrc) >> 4];
+                  *pDest++ = hex_chars[(*pSrc) & 0x0f];
+                }
+
+              *pDest='\0';
+            }
+          else
+#endif
+            {
+              func(src_buffer, src_buff_len, buffer, &buff_len,(is_websafe)?1:0);
+            }
+        }
+
+      nsh_output(vtbl, "%s\n",buffer);
+      src_buffer = NULL;
+      goto exit;
+    }
+
+exit:
+  if (fd >= 0)
+    {
+      close(fd);
+    }
+
+  if (fullpath)
+    {
+      free(fullpath);
+    }
+
+  if (src_buffer)
+    {
+      free(src_buffer);
+    }
+
+  if (buffer)
+    {
+      free(buffer);
+    }
+
+  return ret;
+
+errout:
+  nsh_output(vtbl, fmt, argv[0]);
+  ret = ERROR;
+  goto exit;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: cmd_urlencode
+ ****************************************************************************/
+
+#if defined(CONFIG_CODECS_URLCODE) && !defined(CONFIG_NSH_DISABLE_URLENCODE)
+int cmd_urlencode(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
+{
+  return cmd_codecs_proc(vtbl, argc, argv, CODEC_MODE_URLENCODE, urlencode_cb);
+}
+#endif
+
+/****************************************************************************
+ * Name: cmd_urldecode
+ ****************************************************************************/
+
+#if defined(CONFIG_CODECS_URLCODE) && !defined(CONFIG_NSH_DISABLE_URLDECODE)
+int cmd_urldecode(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
+{
+  return cmd_codecs_proc(vtbl, argc, argv, CODEC_MODE_URLDECODE, urldecode_cb);
+}
+#endif
+
+/****************************************************************************
+ * Name: cmd_base64encode
+ ****************************************************************************/
+
+#if defined(CONFIG_CODECS_BASE64) && !defined(CONFIG_NSH_DISABLE_BASE64ENC)
+int cmd_base64encode(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
+{
+  return cmd_codecs_proc(vtbl, argc, argv, CODEC_MODE_BASE64ENC, b64enc_cb);
+}
+#endif
+
+/****************************************************************************
+ * Name: cmd_base64decode
+ ****************************************************************************/
+
+#if defined(CONFIG_CODECS_BASE64) && !defined(CONFIG_NSH_DISABLE_BASE64DEC)
+int cmd_base64decode(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
+{
+  return cmd_codecs_proc(vtbl, argc, argv, CODEC_MODE_BASE64DEC, b64dec_cb);
+}
+#endif
+
+/****************************************************************************
+ * Name: cmd_md5
+ ****************************************************************************/
+
+#if defined(CONFIG_CODECS_HASH_MD5) && !defined(CONFIG_NSH_DISABLE_MD5)
+int cmd_md5(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
+{
+  return cmd_codecs_proc(vtbl,argc,argv,CODEC_MODE_HASH_MD5,md5_cb);
+}
+#endif
+
+#endif /* CONFIG_NETUTILS_CODECS */
diff --git a/apps/nshlib/nsh_parse.c b/apps/nshlib/nsh_parse.c
index 70fa39f62..15723b497 100644
--- a/apps/nshlib/nsh_parse.c
+++ b/apps/nshlib/nsh_parse.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * apps/nshlib/nsh_parse.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
@@ -72,7 +72,7 @@
 
 /* Argument list size
  *
- *   argv[0]:      The command name. 
+ *   argv[0]:      The command name.
  *   argv[1]:      The beginning of argument (up to CONFIG_NSH_MAXARGUMENTS)
  *   argv[argc-3]: Possibly '>' or '>>'
  *   argv[argc-2]: Possibly <file>
@@ -226,7 +226,7 @@ static const struct cmdmap_s g_cmdmap[] =
   { "help",     cmd_help,     1, 3, "[-v] [<cmd>]" },
 # endif
 #endif
-  
+
 #if CONFIG_NFILE_DESCRIPTORS > 0
 #ifndef CONFIG_NSH_DISABLE_HEXDUMP
   { "hexdump",  cmd_hexdump,  2, 2, "<file or device>" },
@@ -723,15 +723,11 @@ static int cmd_exit(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
  * Name: nsh_execute
  *
  * Description:
- *   Exectue the command in argv[0]
+ *   Execute the command in argv[0]
  *
  * Returned Value:
- *   <0          If exec_builtin() fails, then the negated errno value
- *               is returned.
  *   -1 (ERRROR) if the command was unsuccessful
  *    0 (OK)     if the command was successful
- *    1          if an application task was spawned successfully, but
- *               returned failure exit status.
  *
  ****************************************************************************/
 
@@ -751,21 +747,6 @@ static int nsh_execute(FAR struct nsh_vtbl_s *vtbl, int argc, char *argv[])
    */
 
   cmd = argv[0];
-   
-  /* Try to find a command in the application library. */
-
-#ifdef CONFIG_NSH_BUILTIN_APPS
-  ret = nsh_execapp(vtbl, cmd, argv);
-
-  /* If the built-in application was successfully started, return OK 
-   * or 1 (if the application returned a non-zero exit status).
-   */
-
-  if (ret >= 0)
-    {
-      return ret;
-    }
-#endif
 
   /* See if the command is one that we understand */
 
@@ -1352,7 +1333,7 @@ int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline)
   /* Parse all of the arguments following the command name.  The form
    * of argv is:
    *
-   *   argv[0]:      The command name. 
+   *   argv[0]:      The command name.
    *   argv[1]:      The beginning of argument (up to CONFIG_NSH_MAXARGUMENTS)
    *   argv[argc-3]: Possibly '>' or '>>'
    *   argv[argc-2]: Possibly <file>
@@ -1410,6 +1391,47 @@ int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline)
         }
     }
 
+  /* Check if the maximum number of arguments was exceeded */
+
+  if (argc > CONFIG_NSH_MAXARGUMENTS)
+    {
+      nsh_output(vtbl, g_fmttoomanyargs, cmd);
+    }
+
+  /* Does this command correspond to a builtin command?
+   * nsh_builtin() returns:
+   *
+   *   -1 (ERROR)  if the application task corresponding to 'argv[0]' could not
+   *               be started (possibly because it doesn not exist).
+   *    0 (OK)     if the application task corresponding to 'argv[0]' was
+   *               and successfully started.  If CONFIG_SCHED_WAITPID is
+   *               defined, this return value also indicates that the
+   *               application returned successful status (EXIT_SUCCESS)
+   *    1          If CONFIG_SCHED_WAITPID is defined, then this return value
+   *               indicates that the application task was spawned successfully
+   *               but returned failure exit status.
+   *
+   * Note the priority if not effected by nice-ness.
+   */
+
+#ifdef CONFIG_NSH_BUILTIN_APPS
+  ret = nsh_builtin(vtbl, argv[0], argv, redirfile, oflags);
+  if (ret >= 0)
+    {
+      /* nsh_builtin() returned 0 or 1.  This means that the builtin
+       * command was successfully started (although it may not have ran
+       * successfully).  So certainly it is not an NSH command.
+       */
+
+      return nsh_saveresult(vtbl, ret != OK);
+    }
+
+  /* No, not a built in command (or, at least, we were unable to start a
+   * builtin command of that name).  Treat it like an NSH command.
+   */
+
+#endif
+
   /* Redirected output? */
 
   if (vtbl->np.np_redirect)
@@ -1431,23 +1453,13 @@ int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline)
         }
     }
 
-  /* Check if the maximum number of arguments was exceeded */
-
-  if (argc > CONFIG_NSH_MAXARGUMENTS)
-    {
-      nsh_output(vtbl, g_fmttoomanyargs, cmd);
-    }
-
   /* Handle the case where the command is executed in background.
    * However is app is to be started as builtin new process will
-   * be created anyway, so skip this step. */
+   * be created anyway, so skip this step.
+   */
 
 #ifndef CONFIG_NSH_DISABLEBG
-  if (vtbl->np.np_bg
-#ifdef CONFIG_NSH_BUILTIN_APPS
-      && builtin_isavail(argv[0]) < 0     
-#endif
-  )
+  if (vtbl->np.np_bg)
     {
       struct sched_param param;
       struct nsh_vtbl_s *bkgvtbl;
@@ -1514,6 +1526,7 @@ int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline)
                   priority = min_priority;
                 }
             }
+
           param.sched_priority = priority;
         }
 
@@ -1553,8 +1566,6 @@ int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline)
        *
        * -1 (ERRROR) if the command was unsuccessful
        *  0 (OK)     if the command was successful
-       *  1          if an application task was spawned successfully, but
-       *             returned failure exit status.
        */
 
       ret = nsh_execute(vtbl, argc, argv);
@@ -1568,11 +1579,11 @@ int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline)
           nsh_undirect(vtbl, save);
         }
 
-      /* Treat both errors and non-zero return codes as "errors" so that
-       * it is possible to test for non-zero returns in nsh scripts.
+      /* Mark errors so that it is possible to test for non-zero return values
+       * in nsh scripts.
        */
 
-      if (ret != OK)
+      if (ret < 0)
         {
           goto errout;
         }
diff --git a/nuttx/configs/sim/nsh/defconfig b/nuttx/configs/sim/nsh/defconfig
index 794b3107d..cec10459a 100644
--- a/nuttx/configs/sim/nsh/defconfig
+++ b/nuttx/configs/sim/nsh/defconfig
@@ -73,7 +73,7 @@ CONFIG_SCHED_WORKPRIORITY=192
 CONFIG_SCHED_WORKPERIOD=50000
 CONFIG_SCHED_WORKSTACKSIZE=1024
 CONFIG_SIG_SIGWORK=17
-CONFIG_SCHED_WAITPID=n
+CONFIG_SCHED_WAITPID=y
 CONFIG_SCHED_ATEXIT=n
 CONFIG_SCHED_ONEXIT=n
 
@@ -224,6 +224,7 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
 #
 # Settings for apps/nshlib
 #
+CONFIG_NSH_BUILTIN_APPS=n
 CONFIG_NSH_FILEIOSIZE=1024
 CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=80
diff --git a/nuttx/configs/vsn/src/README.txt b/nuttx/configs/vsn/src/README.txt
index 87a538a10..732ede5e6 100644
--- a/nuttx/configs/vsn/src/README.txt
+++ b/nuttx/configs/vsn/src/README.txt
@@ -12,8 +12,7 @@ Execution starts in the following order:
    is set. It must be set for the VSN board.
    
  - boot, performs initial chip and board initialization
- - sched/os_bringup.c then calls either user_start or exec_builtin()
-   with application as set in the .config
+ - sched/os_bringup.c then calls user entry defined in the .config file.
 
 
 Naming throughout the code
diff --git a/nuttx/fs/fat/fs_fat32.c b/nuttx/fs/fat/fs_fat32.c
index 7164a9f8f..c10c28a5c 100644
--- a/nuttx/fs/fat/fs_fat32.c
+++ b/nuttx/fs/fat/fs_fat32.c
@@ -1314,15 +1314,16 @@ static int fat_dup(FAR const struct file *oldp, FAR struct file *newp)
    *    file is re-opened.
    */
 
-  newff->ff_bflags           = 0;
-  newff->ff_oflags           = oldff->ff_oflags;
-  newff->ff_sectorsincluster = oldff->ff_sectorsincluster;
-  newff->ff_dirindex         = oldff->ff_dirindex;
-  newff->ff_currentcluster   = oldff->ff_currentcluster;
-  newff->ff_dirsector        = oldff->ff_dirsector;
-  newff->ff_size             = oldff->ff_size;
-  newff->ff_currentsector    = 0;
-  newff->ff_cachesector      = 0;
+  newff->ff_bflags           = 0;                          /* File buffer flags */
+  newff->ff_oflags           = oldff->ff_oflags;           /* File open flags */
+  newff->ff_sectorsincluster = oldff->ff_sectorsincluster; /* Sectors remaining in cluster */
+  newff->ff_dirindex         = oldff->ff_dirindex;         /* Index to directory entry */
+  newff->ff_currentcluster   = oldff->ff_currentcluster;   /* Current cluster */
+  newff->ff_dirsector        = oldff->ff_dirsector;        /* Sector containing directory entry */
+  newff->ff_size             = oldff->ff_size;             /* Size of the file */
+  newff->ff_startcluster     = oldff->ff_startcluster;     /* Start cluster of file on media */
+  newff->ff_currentsector    = oldff->ff_currentsector;    /* Current sector */
+  newff->ff_cachesector      = 0;                          /* Sector in file buffer */
 
   /* Attach the private date to the struct file instance */
 
diff --git a/nuttx/fs/romfs/fs_romfs.c b/nuttx/fs/romfs/fs_romfs.c
index 2814aa49d..6a6fca355 100644
--- a/nuttx/fs/romfs/fs_romfs.c
+++ b/nuttx/fs/romfs/fs_romfs.c
@@ -56,6 +56,7 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/fs/dirent.h>
@@ -225,7 +226,7 @@ static int romfs_open(FAR struct file *filep, FAR const char *relpath,
    * file.
    */
 
-  rf = (FAR struct romfs_file_s *)zalloc(sizeof(struct romfs_file_s));
+  rf = (FAR struct romfs_file_s *)kzalloc(sizeof(struct romfs_file_s));
   if (!rf)
     {
       fdbg("Failed to allocate private data\n", ret);
@@ -317,12 +318,12 @@ static int romfs_close(FAR struct file *filep)
 
   if (!rm->rm_xipbase && rf->rf_buffer)
     {
-      free(rf->rf_buffer);
+      kfree(rf->rf_buffer);
     }
 
   /* Then free the file structure itself. */
 
-  free(rf);
+  kfree(rf);
   filep->f_priv = NULL;
   return ret;
 }
@@ -915,7 +916,7 @@ static int romfs_bind(FAR struct inode *blkdriver, FAR const void *data,
 
   /* Create an instance of the mountpt state structure */
 
-  rm = (FAR struct romfs_mountpt_s *)zalloc(sizeof(struct romfs_mountpt_s));
+  rm = (FAR struct romfs_mountpt_s *)kzalloc(sizeof(struct romfs_mountpt_s));
   if (!rm)
     {
       fdbg("Failed to allocate mountpoint structure\n");
@@ -959,12 +960,12 @@ static int romfs_bind(FAR struct inode *blkdriver, FAR const void *data,
 errout_with_buffer:
   if (!rm->rm_xipbase)
     {
-      free(rm->rm_buffer);
+      kfree(rm->rm_buffer);
     }
 
 errout_with_sem:
   sem_destroy(&rm->rm_sem);
-  free(rm);
+  kfree(rm);
   return ret;
 }
 
@@ -1031,11 +1032,11 @@ static int romfs_unbind(FAR void *handle, FAR struct inode **blkdriver)
 
       if (!rm->rm_xipbase && rm->rm_buffer)
         {
-          free(rm->rm_buffer);
+          kfree(rm->rm_buffer);
         }
 
       sem_destroy(&rm->rm_sem);
-      free(rm);
+      kfree(rm);
       return OK;
     }