2007-12-17 Chris Johns <chrisj@rtems.org>

	* libmisc/shell/main_blksync.c, libmisc/shell/main_msdosfmt.c,
	libmisc/shell/main_unmount.c: New.
	* libmisc/Makefile.am, libmisc/shell/shellconfig.h: Add the
	blksync, msdosfmt, and unmount commands.

5 files changed, 320 insertions, 3 deletions

diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am
index b8eba903d5..fbd78e3052 100644
--- a/cpukit/libmisc/Makefile.am
+++ b/cpukit/libmisc/Makefile.am
@@ -76,10 +76,11 @@ libshell_a_SOURCES = shell/cat_file.c shell/cmds.c shell/internal.h \
     shell/main_logoff.c shell/main_ls.c shell/main_mallocdump.c \
     shell/main_mdump.c shell/main_medit.c shell/main_mfill.c \
     shell/main_mkdir.c shell/main_mount.c  $(shell_mount_fs) \
-    shell/main_mount_msdos.c shell/main_mmove.c shell/main_mwdump.c \
-    shell/main_pwd.c shell/main_rm.c shell/main_rmdir.c \
+    shell/main_mount_msdos.c shell/main_mmove.c shell/main_msdosfmt.c \
+    shell/main_mwdump.c shell/main_pwd.c shell/main_rm.c shell/main_rmdir.c \
     shell/main_stackuse.c shell/main_tty.c shell/main_umask.c \
-    shell/main_whoami.c shell/shell.c shell/shell_cmdset.c shell/shellconfig.c \
+    shell/main_unmount.c shell/main_blksync.c shell/main_whoami.c \
+    shell/shell.c shell/shell_cmdset.c shell/shellconfig.c \
     shell/shellconfig.h shell/shell.h shell/shell_makeargs.c \
     shell/str2int.c shell/write_file.c
 endif
diff --git a/cpukit/libmisc/shell/main_blksync.c b/cpukit/libmisc/shell/main_blksync.c
new file mode 100644
index 0000000000..eade795fad
--- /dev/null
+++ b/cpukit/libmisc/shell/main_blksync.c
@@ -0,0 +1,80 @@
+/*
+ *  RM Shell Command Implmentation
+ *
+ *  Author: Fernando RUIZ CASAS
+ *  Work: fernando.ruiz@ctv.es
+ *  Home: correo@fernando-ruiz.com
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#include <rtems.h>
+#include <rtems/shell.h>
+#include <rtems/bdbuf.h>
+#include <rtems/blkdev.h>
+#include "internal.h"
+
+int rtems_shell_main_blksync(int argc, char *argv[])
+{
+  const char* driver = NULL;
+  int         arg;
+  
+  for (arg = 1; arg < argc; arg++)
+  {
+    if (argv[arg][0] == '-')
+    {
+      printf ("error: invalid option: %s\n", argv[arg]);
+      return 1;
+    }
+    else
+    {
+      if (!driver)
+        driver = argv[arg];
+      else
+      {
+        printf ("error: only one driver name allowed: %s\n", argv[arg]);
+        return 1;
+      }
+    }
+  }
+  
+  int fd = open (driver, O_WRONLY, 0);
+  if (fd < 0)
+  {
+    printf ("error: driver open failed: %s\n", strerror (errno));
+    return 1;
+  }
+  
+  if (ioctl (fd, BLKIO_SYNCDEV) < 0)
+  {
+    printf ("error: driver sync failed: %s\n", strerror (errno));
+    return 1;
+  }
+  
+  close (fd);
+  
+  return 0;
+}
+
+rtems_shell_cmd_t rtems_Shell_BLKSYNC_Command = {
+  "blksync",                                 /* name */
+  "blksync driver # sync the block driver",  /* usage */
+  "files",                                   /* topic */
+  rtems_shell_main_blksync,                  /* command */
+  NULL,                                      /* alias */
+  NULL                                       /* next */
+};
diff --git a/cpukit/libmisc/shell/main_msdosfmt.c b/cpukit/libmisc/shell/main_msdosfmt.c
new file mode 100644
index 0000000000..9f7f83a7df
--- /dev/null
+++ b/cpukit/libmisc/shell/main_msdosfmt.c
@@ -0,0 +1,143 @@
+/*
+ *   Shell Command Implmentation
+ *
+ *  Author: Fernando RUIZ CASAS
+ *  Work: fernando.ruiz@ctv.es
+ *  Home: correo@fernando-ruiz.com
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+
+#include <rtems.h>
+#include <rtems/shell.h>
+#include <rtems/shellconfig.h>
+#include <rtems/dosfs.h>
+#include <rtems/fsmount.h>
+#include "internal.h"
+
+int rtems_shell_main_msdos_format(int argc, char *argv[])
+{
+  msdos_format_request_param_t rqdata = {
+    OEMName:             "RTEMS",
+    VolLabel:            "RTEMSDisk",
+    sectors_per_cluster: 0,
+    fat_num:             0,
+    files_per_root_dir:  0,
+    fattype:             MSDOS_FMT_FATANY,
+    media:               0,
+    quick_format:        TRUE,
+    cluster_align:       0
+  };
+  
+  const char* driver = NULL;
+  int         arg;
+  
+  for (arg = 1; arg < argc; arg++)
+  {
+    if (argv[arg][0] == '-')
+    {
+      switch (argv[arg][1])
+      {
+        case 'v':
+          arg++;
+          if (arg == argc)
+          {
+            printf ("error: no volume label.\n");
+            return 1;
+          }
+          rqdata.VolLabel = argv[arg];
+          break;
+          
+        case 'r':
+          arg++;
+          if (arg == argc)
+          {
+            printf ("error: no root directory size.\n");
+            return 1;
+          }
+          rqdata.files_per_root_dir = rtems_shell_str2int(argv[arg]);
+          break;
+          
+        case 't':
+          arg++;
+          if (arg == argc)
+          {
+            printf ("error: no FAT type.\n");
+            return 1;
+          }
+
+          if (strcmp (argv[arg], "any") == 0)
+            rqdata.fattype = MSDOS_FMT_FATANY;
+          else if (strcmp (argv[arg], "12") == 0)
+            rqdata.fattype = MSDOS_FMT_FAT12;
+          else if (strcmp (argv[arg], "16") == 0)
+            rqdata.fattype = MSDOS_FMT_FAT16;
+          else if (strcmp (argv[arg], "32") == 0)
+            rqdata.fattype = MSDOS_FMT_FAT32;
+          else
+          {
+            printf ("error: invalid type, can any, 12, 16, or 32\n");
+            return 1;
+          }
+          break;
+
+        default:
+          printf ("error: invalid option: %s\n", argv[arg]);
+          return 1;
+          
+      }
+    }
+    else
+    {
+      if (!driver)
+        driver = argv[arg];
+      else
+      {
+        printf ("error: only one driver allowed: %s\n", argv[arg]);
+        return 1;
+      }
+    }
+  }
+
+  if (!driver)
+  {
+    printf ("error: no driver\n");
+    return 1;
+  }
+  
+  printf ("msdos format: %s\n", driver);
+  
+  if (msdos_format (driver, &rqdata) < 0)
+  {
+    printf ("error: format failed: %s\n", strerror (errno));
+    return 1;
+  }
+
+  printf ("msdos format successful\n");
+
+  return 0;
+}
+
+#define OPTIONS "[-v label] [-r size] [-t any/12/16/32]"
+
+rtems_shell_cmd_t rtems_Shell_MSDOSFMT_Command = {
+  "msdosfmt",                                /* name */
+  "msdosfmt " OPTIONS " path # format disk", /* usage */
+  "files",                                   /* topic */
+  rtems_shell_main_msdos_format,             /* command */
+  NULL,                                      /* alias */
+  NULL                                       /* next */
+};
diff --git a/cpukit/libmisc/shell/main_unmount.c b/cpukit/libmisc/shell/main_unmount.c
new file mode 100644
index 0000000000..ab06adb421
--- /dev/null
+++ b/cpukit/libmisc/shell/main_unmount.c
@@ -0,0 +1,75 @@
+/*
+ *   Shell Command Implmentation
+ *
+ *  Author: Fernando RUIZ CASAS
+ *  Work: fernando.ruiz@ctv.es
+ *  Home: correo@fernando-ruiz.com
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+
+#include <rtems.h>
+#include <rtems/shell.h>
+#include <rtems/shellconfig.h>
+#include <rtems/fsmount.h>
+#include "internal.h"
+
+int rtems_shell_main_unmount(int argc, char *argv[])
+{
+  char* mount_point = NULL;
+  int   arg;
+  
+  for (arg = 1; arg < argc; arg++)
+  {
+    if (!mount_point)
+      mount_point = argv[arg];
+    else
+    {
+      printf ("error: only one mount path require: %s\n", argv[arg]);
+      return 1;
+    }
+  }
+
+  if (!mount_point)
+  {
+    printf ("error: no mount point\n");
+    return 1;
+  }
+  
+  /*
+   * Unmount the disk.
+   */
+  
+  if (unmount (mount_point) < 0)
+  {
+    fprintf (stdout, "error: unmount failed: %s: %s\n",
+             mount_point, strerror (errno));
+    return 1;
+  }
+  
+  printf ("unmounted %s\n", mount_point);
+  
+  return 0;
+}
+
+rtems_shell_cmd_t rtems_Shell_UNMOUNT_Command = {
+  "unmount",                     /* name */
+  "unmount path # unmount disk", /* usage */
+  "files",                       /* topic */
+  rtems_shell_main_unmount,      /* command */
+  NULL,                          /* alias */
+  NULL                           /* next */
+};
diff --git a/cpukit/libmisc/shell/shellconfig.h b/cpukit/libmisc/shell/shellconfig.h
index 21d90f732c..aa7cf7c2f3 100644
--- a/cpukit/libmisc/shell/shellconfig.h
+++ b/cpukit/libmisc/shell/shellconfig.h
@@ -42,9 +42,12 @@ extern rtems_shell_cmd_t rtems_Shell_RMDIR_Command;
 extern rtems_shell_cmd_t rtems_Shell_CHROOT_Command;
 extern rtems_shell_cmd_t rtems_Shell_CHMOD_Command;
 extern rtems_shell_cmd_t rtems_Shell_CAT_Command;
+extern rtems_shell_cmd_t rtems_Shell_MSDOSFMT_Command;
 extern rtems_shell_cmd_t rtems_Shell_RM_Command;
 extern rtems_shell_cmd_t rtems_Shell_UMASK_Command;
 extern rtems_shell_cmd_t rtems_Shell_MOUNT_Command;
+extern rtems_shell_cmd_t rtems_Shell_UNMOUNT_Command;
+extern rtems_shell_cmd_t rtems_Shell_BLKSYNC_Command;
 
 extern rtems_shell_cmd_t rtems_Shell_CPUUSE_Command;
 extern rtems_shell_cmd_t rtems_Shell_STACKUSE_Command;
@@ -229,6 +232,11 @@ extern rtems_shell_filesystems_t *rtems_Shell_Mount_filesystems[];
       &rtems_Shell_CAT_Command,
     #endif
     #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \
+         !defined(CONFIGURE_SHELL_NO_COMMAND_MSDOSFMT)) || \
+        defined(CONFIGURE_SHELL_COMMAND_MSDOSFMT)
+      &rtems_Shell_MSDOSFMT_Command,
+    #endif
+    #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \
          !defined(CONFIGURE_SHELL_NO_COMMAND_RM)) || \
         defined(CONFIGURE_SHELL_COMMAND_RM)
       &rtems_Shell_RM_Command,
@@ -243,6 +251,16 @@ extern rtems_shell_filesystems_t *rtems_Shell_Mount_filesystems[];
         defined(CONFIGURE_SHELL_COMMAND_MOUNT)
       &rtems_Shell_MOUNT_Command,
     #endif
+    #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \
+         !defined(CONFIGURE_SHELL_NO_COMMAND_UNMOUNT)) || \
+        defined(CONFIGURE_SHELL_COMMAND_UNMOUNT)
+      &rtems_Shell_UNMOUNT_Command,
+    #endif
+    #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \
+         !defined(CONFIGURE_SHELL_NO_COMMAND_BLKSYNC)) || \
+        defined(CONFIGURE_SHELL_COMMAND_BLKSYNC)
+      &rtems_Shell_BLKSYNC_Command,
+    #endif
 
     /*
      *  RTEMS Related commands