From dfe0e5833a279b70e077a1b0b36e9903f1dc6d13 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Wed, 27 Feb 2008 21:52:16 +0000
Subject: 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.
---
 cpukit/libmisc/shell/main_cpuuse.c | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

(limited to 'cpukit/libmisc/shell/main_cpuuse.c')

diff --git a/cpukit/libmisc/shell/main_cpuuse.c b/cpukit/libmisc/shell/main_cpuuse.c
index 2ca92812c7..492997cd8f 100644
--- a/cpukit/libmisc/shell/main_cpuuse.c
+++ b/cpukit/libmisc/shell/main_cpuuse.c
@@ -22,14 +22,33 @@
 #include <rtems/shell.h>
 #include "internal.h"
 
-int rtems_shell_main_cpuuse(int argc,char *argv[])
+int rtems_shell_main_cpuuse(
+  int   argc,
+  char *argv[]
+)
 {
-  if ( argc >= 1 && !strcmp( argv[1], "-r" ) ) {
+  /*
+   *  When invoked with no arguments, print the report.
+   */
+  if ( argc == 1 ) {
+    rtems_cpu_usage_report_with_plugin(stdout, (rtems_printk_plugin_t)fprintf);
+    return 0;
+  }
+
+  /*
+   *  When invoked with the single argument -r, reset the statistics.
+   */
+  if ( argc == 2 && !strcmp( argv[1], "-r" ) ) {
     printf( "Resetting CPU Usage information\n" );
     rtems_cpu_usage_reset();
-  } else
-    rtems_cpu_usage_report_with_plugin(stdout, (rtems_printk_plugin_t)fprintf);
-  return 0;
+    return 0;
+  }
+
+  /*
+   *  OK.  The user did something wrong.
+   */
+  fprintf( stderr, "%s: [-r]\n", argv[0] );
+  return -1;
 }
 
 rtems_shell_cmd_t rtems_shell_CPUUSE_Command = {
-- 
cgit v1.2.3