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, 23 insertions, 32 deletions

diff --git a/cpukit/libmisc/shell/main_msdosfmt.c b/cpukit/libmisc/shell/main_msdosfmt.c
index 24d978e07a..12ba79e8c8 100644
--- a/cpukit/libmisc/shell/main_msdosfmt.c
+++ b/cpukit/libmisc/shell/main_msdosfmt.c
@@ -28,7 +28,10 @@
 #include <rtems/fsmount.h>
 #include "internal.h"
 
-int rtems_shell_main_msdos_format(int argc, char *argv[])
+int rtems_shell_main_msdos_format(
+  int   argc,
+  char *argv[]
+)
 {
   msdos_format_request_param_t rqdata = {
     OEMName:             "RTEMS",
@@ -45,17 +48,13 @@ int rtems_shell_main_msdos_format(int argc, char *argv[])
   const char* driver = NULL;
   int         arg;
   
-  for (arg = 1; arg < argc; arg++)
-  {
-    if (argv[arg][0] == '-')
-    {
-      switch (argv[arg][1])
-      {
+  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");
+          if (arg == argc) {
+            fprintf (stderr, "error: no volume label.\n");
             return 1;
           }
           rqdata.VolLabel = argv[arg];
@@ -63,9 +62,8 @@ int rtems_shell_main_msdos_format(int argc, char *argv[])
           
         case 'r':
           arg++;
-          if (arg == argc)
-          {
-            printf ("error: no root directory size.\n");
+          if (arg == argc) {
+            fprintf (stderr, "error: no root directory size.\n");
             return 1;
           }
           rqdata.files_per_root_dir = rtems_shell_str2int(argv[arg]);
@@ -73,9 +71,8 @@ int rtems_shell_main_msdos_format(int argc, char *argv[])
           
         case 't':
           arg++;
-          if (arg == argc)
-          {
-            printf ("error: no FAT type.\n");
+          if (arg == argc) {
+            fprintf (stderr, "error: no FAT type.\n");
             return 1;
           }
 
@@ -87,42 +84,36 @@ int rtems_shell_main_msdos_format(int argc, char *argv[])
             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");
+          else {
+            fprintf (stderr, "error: invalid type, can any, 12, 16, or 32\n");
             return 1;
           }
           break;
 
         default:
-          printf ("error: invalid option: %s\n", argv[arg]);
+          fprintf (stderr, "error: invalid option: %s\n", argv[arg]);
           return 1;
           
       }
-    }
-    else
-    {
+    } else {
       if (!driver)
         driver = argv[arg];
-      else
-      {
-        printf ("error: only one driver allowed: %s\n", argv[arg]);
+      else {
+        fprintf (stderr, "error: only one driver allowed: %s\n", argv[arg]);
         return 1;
       }
     }
   }
 
-  if (!driver)
-  {
-    printf ("error: no driver\n");
+  if (!driver) {
+    fprintf (stderr, "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));
+  if (msdos_format (driver, &rqdata) < 0) {
+    fprintf (stderr, "error: format failed: %s\n", strerror (errno));
     return 1;
   }