2008-02-27 Joel Sherrill <joel.sherrill@oarcorp.com>

	* libmisc/shell/cat_file.c, libmisc/shell/main_alias.c,
	libmisc/shell/main_blksync.c, libmisc/shell/main_cat.c,
	libmisc/shell/main_chdir.c, libmisc/shell/main_chmod.c,
	libmisc/shell/main_chroot.c, libmisc/shell/main_cpuuse.c,
	libmisc/shell/main_date.c, libmisc/shell/main_help.c,
	libmisc/shell/main_id.c, libmisc/shell/main_logoff.c,
	libmisc/shell/main_ls.c, libmisc/shell/main_mallocinfo.c,
	libmisc/shell/main_mdump.c, libmisc/shell/main_medit.c,
	libmisc/shell/main_mfill.c, libmisc/shell/main_mkdir.c,
	libmisc/shell/main_mmove.c, libmisc/shell/main_mount.c,
	libmisc/shell/main_mount_nfs.c, libmisc/shell/main_msdosfmt.c,
	libmisc/shell/main_mwdump.c, libmisc/shell/main_perioduse.c,
	libmisc/shell/main_pwd.c, libmisc/shell/main_rm.c,
	libmisc/shell/main_rmdir.c, libmisc/shell/main_stackuse.c,
	libmisc/shell/main_tty.c, libmisc/shell/main_umask.c,
	libmisc/shell/main_unmount.c, libmisc/shell/main_whoami.c,
	libmisc/shell/shell.h: Clean up done while writing documentation.
	Some command improvements such as date now allows setting of the
	current TOD. Often commands did not use stdout/stderr per
	expectations and did not return -1 on an error.

1 files changed, 38 insertions, 47 deletions

diff --git a/cpukit/libmisc/shell/main_mount.c b/cpukit/libmisc/shell/main_mount.c
index b09b8ea5eb..c949715313 100644
--- a/cpukit/libmisc/shell/main_mount.c
+++ b/cpukit/libmisc/shell/main_mount.c
@@ -28,10 +28,11 @@
 #include <rtems/fsmount.h>
 #include "internal.h"
 
-int rtems_shell_libc_mounter(const char*                driver,
-                             const char*                path,
-                             rtems_shell_filesystems_t* fs,
-                             rtems_filesystem_options_t options)
+int rtems_shell_libc_mounter(
+  const char*                driver,
+  const char*                path,
+  rtems_shell_filesystems_t* fs,
+  rtems_filesystem_options_t options)
 {
   rtems_filesystem_mount_table_entry_t* mt_entry;
   /*
@@ -40,7 +41,7 @@ int rtems_shell_libc_mounter(const char*                driver,
   
   if (mount (&mt_entry, fs->fs_ops, options, (char*) driver, (char*) path) < 0)
   {
-    printf ("error: mount failed: %s\n", strerror (errno));
+    fprintf (stderr, "mount: mount failed: %s\n", strerror (errno));
     return 1;
   }
   
@@ -49,7 +50,10 @@ int rtems_shell_libc_mounter(const char*                driver,
 
 #define NUMOF(_i) (sizeof (_i) / sizeof (_i[0]))
 
-int rtems_shell_main_mount(int argc, char *argv[])
+int rtems_shell_main_mount(
+  int   argc,
+  char *argv[]
+)
 {
   rtems_filesystem_options_t options = RTEMS_FILESYSTEM_READ_WRITE;
   rtems_shell_filesystems_t* fs = NULL;
@@ -57,79 +61,66 @@ int rtems_shell_main_mount(int argc, char *argv[])
   char*                      mount_point = NULL;
   int                        arg;
   
-  for (arg = 1; arg < argc; arg++)
-  {
-    if (argv[arg][0] == '-')
-    {
-      if (argv[arg][1] == 't')
-      {
+  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 (stdout, "error: -t needs a type of file-system;; see -L.\n");
+        if (arg == argc) {
+          fprintf(
+            stderr,
+            "%s: -t needs a type of file-system;; see -L.\n",
+            argv[0]
+          );
           return 1;
         }
 
-        for (a = rtems_shell_Mount_filesystems; *a; a++)
-        {
-          if (strcmp (argv[arg], (*a)->name) == 0)
-          {
+        for (a = rtems_shell_Mount_filesystems; *a; a++) {
+          if (strcmp (argv[arg], (*a)->name) == 0) {
             fs = *a;
             break;
           }
         }
-      }
-      else if (argv[arg][1] == 'r')
-      {
+      } else if (argv[arg][1] == 'r') {
         options = RTEMS_FILESYSTEM_READ_ONLY;
-      }
-      else if (argv[arg][1] == 'L')
-      {
+      } else if (argv[arg][1] == 'L') {
         rtems_shell_filesystems_t** a;
-        fprintf (stdout, "File systems: ");
+        fprintf (stderr, "File systems: ");
         for (a = rtems_shell_Mount_filesystems; *a; a++)
           if (*a)
-            fprintf (stdout, "%s ", (*a)->name);
-        fprintf (stdout, "\n");
+            fprintf (stderr, "%s ", (*a)->name);
+        fprintf (stderr, "\n");
         return 1;
-      }
-      else
-      {
-        fprintf (stdout, "unknown option: %s\n", argv[arg]);
+      } else {
+        fprintf (stderr, "unknown option: %s\n", argv[arg]);
         return 1;
       }
-    }
-    else
-    {
+    } else {
       if (!driver)
         driver = argv[arg];
       else if (!mount_point)
         mount_point = argv[arg];
-      else
-      {
-        printf ("error: driver and mount only require: %s\n", argv[arg]);
+      else {
+        fprintf (
+          stderr, "mount: driver and mount only require: %s\n", argv[arg]);
         return 1;
       }
     }
   }
 
-  if (fs == NULL)
-  {
-    fprintf (stdout, "error: no file-system; see the -L option\n");
+  if (fs == NULL) {
+    fprintf (stderr, "mount: no file-system; see the -L option\n");
     return 1;
   }
   
-  if (fs->driver_needed && !driver)
-  {
-    fprintf (stdout, "error: no driver\n");
+  if (fs->driver_needed && !driver) {
+    fprintf (stderr, "mount: no driver\n");
     return 1;
   }
   
-  if (!mount_point)
-  {
-    printf ("error: no mount point\n");
+  if (!mount_point) {
+    fprintf (stderr, "mount: no mount point\n");
     return 1;
   }