More NFS updates

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

2 files changed, 137 insertions, 3 deletions

diff --git a/apps/nshlib/nsh_fscmds.c b/apps/nshlib/nsh_fscmds.c
index 56a52737a..b3c394834 100644
--- a/apps/nshlib/nsh_fscmds.c
+++ b/apps/nshlib/nsh_fscmds.c
@@ -1174,7 +1174,7 @@ int cmd_mount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
       return ERROR;
     }
 
-  /* The source and target pathes might be relative to the current
+  /* The source and target paths might be relative to the current
    * working directory.
    */
 
@@ -1185,7 +1185,7 @@ int cmd_mount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
     }
 
   target = nsh_getfullpath(vtbl, argv[optind+1]);
-  if (!source)
+  if (!target)
     {
       nsh_freefullpath(source);
       return ERROR;
@@ -1207,6 +1207,133 @@ int cmd_mount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 #endif
 
 /****************************************************************************
+ * Name: cmd_nfsmount
+ ****************************************************************************/
+
+#if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && \
+    defined(CONFIG_FS_READABLE) && defined(CONFIG_NET) && defined(CONFIG_NFS)
+#ifndef CONFIG_NSH_DISABLE_NFSMOUNT
+int cmd_nfsmount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
+{
+  struct nfs_args data;
+  FAR char *address;
+  FAR char *target;
+  FAR char *protocol = NULL;
+  bool badarg = false;
+#ifdef CONFIG_NET_IPv6
+  struct in6_addr inaddr;
+#else
+  struct in_addr inaddr:
+#endif
+  int ret;
+
+  /* Get the NFS mount options */
+
+  int option;
+  while ((option = getopt(argc, argv, ":p:")) != ERROR)
+    {
+      switch (option)
+        {
+          /* Protocol may be UDP or TCP/IP */
+
+          case 'p':
+            protocol = optarg;
+            break;
+
+          /* Handle missing required arguments */
+
+          case ':':
+            nsh_output(vtbl, g_fmtargrequired, argv[0]);
+            badarg = true;
+            break;
+
+          /* Handle unrecognized arguments */
+
+          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 are two required arguments after the options:  (1) The NFS server IP
+   * address and then (1) the path to the mount point.
+   */
+
+  if (optind + 2 <  argc)
+    {
+      nsh_output(vtbl, g_fmttoomanyargs, argv[0]);
+      return ERROR;
+    }
+  else if (optind + 2 >  argc)
+    {
+      nsh_output(vtbl, g_fmtargrequired, argv[0]);
+      return ERROR;
+    }
+
+  /* The next argument on the command line should be the NFS server IP address
+   * in standard IPv4 (or IPv6) dot format.
+   */
+
+  address = argv[optind];
+  if (!address)
+    {
+      return ERROR;
+    }
+
+  /* The target mount point path might be relative to the current working
+   * directory.
+   */
+
+  target = nsh_getfullpath(vtbl, argv[optind+1]);
+  if (!target)
+    {
+      return ERROR;
+    }
+
+  /* Convert the IP address string into its binary form */
+
+#ifdef CONFIG_NET_IPv6
+  ret = inet_pton(AF_INET, address, &inaddr);
+#else
+  ret = inet_pton(AF_INET6, address, &inaddr);
+#endif
+  if (ret != 1)
+    {
+      nsh_freefullpath(target);
+      return ERROR;
+    }
+
+  /* Place all of the NFS arguements into the nfs_args structure */
+#warning "Missing logic"
+
+  /* Perform the mount */
+
+  ret = mount(NULL, target, "nfs", 0, (FAR void *)&data);
+  if (ret < 0)
+    {
+      nsh_output(vtbl, g_fmtcmdfailed, argv[0], "mount", NSH_ERRNO);
+    }
+
+  /* We no longer need the allocated mount point path */
+
+  nsh_freefullpath(target);
+  return ret;
+}
+#endif
+#endif
+
+/****************************************************************************
  * Name: cmd_rm
  ****************************************************************************/
 
diff --git a/apps/nshlib/nsh_parse.c b/apps/nshlib/nsh_parse.c
index 67d529013..218f6aad9 100644
--- a/apps/nshlib/nsh_parse.c
+++ b/apps/nshlib/nsh_parse.c
@@ -259,7 +259,7 @@ static const struct cmdmap_s g_cmdmap[] =
 
 #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_READABLE)
 # ifndef CONFIG_NSH_DISABLE_MOUNT
-  { "mount",    cmd_mount,    4, 5, "-t <fstype> <block-device> <dir-path>" },
+  { "mount",    cmd_mount,    4, 5, "-t <fstype> <block-device> <mount-point>" },
 # endif
 #endif
 
@@ -267,6 +267,13 @@ static const struct cmdmap_s g_cmdmap[] =
   { "mw",       cmd_mw,       2, 3, "<hex-address>[=<hex-value>][ <hex-byte-count>]" },
 #endif
 
+#if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && \
+    defined(CONFIG_FS_READABLE) && defined(CONFIG_NET) && defined(CONFIG_NFS)
+#  ifndef CONFIG_NSH_DISABLE_NFSMOUNT
+  { "nfsmount", cmd_nfsmount, 3, 5, "[-p <protocol>] <server-address> <mount-point>" },
+#  endif
+#endif
+
 #if defined(CONFIG_NET) && defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \
    !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_DISABLE_SIGNALS)
 # ifndef CONFIG_NSH_DISABLE_PING