4 files changed, 72 insertions, 9 deletions
diff --git a/cpukit/libmisc/fsmount/fsmount.c b/cpukit/libmisc/fsmount/fsmount.c
index 506c44aeb1..6e9ba263a7 100644
--- a/cpukit/libmisc/fsmount/fsmount.c
+++ b/cpukit/libmisc/fsmount/fsmount.c
@@ -76,7 +76,8 @@ int rtems_fsmount_create_mount_point
     /*
      * scan through given string, one segment at a time
      */
-    token_type = IMFS_get_token(mount_point+total_len,token,&token_len);
+    token_type = IMFS_get_token(mount_point+total_len,strlen(mount_point+total_len),
+                                token,&token_len);
     total_len += token_len;
     strncpy(tok_buffer,mount_point,total_len);
     tok_buffer[total_len] = '\0';
diff --git a/cpukit/libmisc/shell/internal.h b/cpukit/libmisc/shell/internal.h
index 1855d0b080..aadd346092 100644
--- a/cpukit/libmisc/shell/internal.h
+++ b/cpukit/libmisc/shell/internal.h
@@ -29,13 +29,6 @@ rtems_shell_topic_t * rtems_shell_lookup_topic(const char *topic);
 void rtems_shell_register_monitor_commands(void);
 void rtems_shell_initialize_command_set(void);
 
-int rtems_shell_libc_mounter(
-  const char*                driver,
-  const char*                path,
-  rtems_shell_filesystems_t* fs,
-  rtems_filesystem_options_t options
-);
-
 void rtems_shell_print_heap_info(
   const char       *c,
   Heap_Information *h
diff --git a/cpukit/libmisc/shell/main_mount.c b/cpukit/libmisc/shell/main_mount.c
index c949715313..43b6aaf36e 100644
--- a/cpukit/libmisc/shell/main_mount.c
+++ b/cpukit/libmisc/shell/main_mount.c
@@ -28,6 +28,30 @@
 #include <rtems/fsmount.h>
 #include "internal.h"
 
+static rtems_chain_control filesystems;
+static bool                fs_init;
+
+static void rtems_shell_mount_fsys_init()
+{
+  if (!fs_init)
+  {
+    rtems_chain_initialize_empty (&filesystems);
+    fs_init = true;
+  }
+}
+
+void rtems_shell_mount_add_fsys(rtems_shell_filesystems_t* fs)
+{
+  rtems_shell_mount_fsys_init();
+  rtems_chain_append (&filesystems, &fs->link);
+}
+
+void rtems_shell_mount_del_fsys(rtems_shell_filesystems_t* fs)
+{
+  if (fs_init)
+    rtems_chain_extract (&fs->link);
+}
+
 int rtems_shell_libc_mounter(
   const char*                driver,
   const char*                path,
@@ -60,12 +84,14 @@ int rtems_shell_main_mount(
   char*                      driver = NULL;
   char*                      mount_point = NULL;
   int                        arg;
+
+  rtems_shell_mount_fsys_init();
   
   for (arg = 1; arg < argc; arg++) {
     if (argv[arg][0] == '-') {
       if (argv[arg][1] == 't') {
         rtems_shell_filesystems_t** a;
-        
+
         arg++;
         if (arg == argc) {
           fprintf(
@@ -82,6 +108,18 @@ int rtems_shell_main_mount(
             break;
           }
         }
+
+        if (!fs && !rtems_chain_is_empty(&filesystems)) {
+          rtems_chain_node* node = filesystems.first;
+          while (!rtems_chain_is_tail (&filesystems, node)) {
+            rtems_shell_filesystems_t* f = (rtems_shell_filesystems_t*)node;
+            if (strcmp (argv[arg], f->name) == 0) {
+              fs = f;
+              break;
+            }
+            node = node->next;
+          }
+        }
       } else if (argv[arg][1] == 'r') {
         options = RTEMS_FILESYSTEM_READ_ONLY;
       } else if (argv[arg][1] == 'L') {
diff --git a/cpukit/libmisc/shell/shell.h b/cpukit/libmisc/shell/shell.h
index 333b03d977..a9782b846b 100644
--- a/cpukit/libmisc/shell/shell.h
+++ b/cpukit/libmisc/shell/shell.h
@@ -24,6 +24,7 @@
 #include <termios.h>
 #include <rtems/fs.h>
 #include <rtems/libio.h>
+#include <rtems/chain.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -232,6 +233,7 @@ typedef int (*rtems_shell_filesystems_mounter_t)(
 );
 
 struct rtems_shell_filesystems_tt {
+  rtems_chain_node                         link;
   const char                              *name;
   int                                      driver_needed;
   const rtems_filesystem_operations_table *fs_ops;
@@ -257,6 +259,35 @@ void rtems_shell_get_prompt(
   size_t             size
 );
 
+/**
+ * Helper for the mount command.
+ *
+ * @param[in] driver The path to the driver.
+ * @param[in] path The path to mount on.
+ * @param[in] fs The file system definition.
+ * @param[in] options Special file system options.
+ */
+int rtems_shell_libc_mounter(
+  const char*                driver,
+  const char*                path,
+  rtems_shell_filesystems_t* fs,
+  rtems_filesystem_options_t options
+);
+
+/**
+ * Add a new file system mount configuration to the mount command.
+ *
+ * @param[in] fs The file system mount data.
+ */
+void rtems_shell_mount_add_fsys(rtems_shell_filesystems_t* fs);
+
+/**
+ * Delete file system mount configuration from the mount command.
+ *
+ * @param[in] fs The file system mount data to remove.
+ */
+void rtems_shell_mount_del_fsys(rtems_shell_filesystems_t* fs);
+
 #ifdef __cplusplus
 }
 #endif