2009-07-22 Joel Sherrill <joel.sherrill@oarcorp.com>

	* libmisc/Makefile.am, libmisc/shell/main_chmod.c,
	libmisc/shell/main_mdump.c, libmisc/shell/main_medit.c,
	libmisc/shell/main_mfill.c, libmisc/shell/main_mmove.c,
	libmisc/shell/main_msdosfmt.c, libmisc/shell/main_mwdump.c,
	libmisc/shell/main_sleep.c, libmisc/shell/main_umask.c,
	libmisc/shell/shell.h, libmisc/shell/shell_script.c,
	libmisc/stringto/stringto_template.h: Convert all shell code to use
	stringto.h mehods with better error checking.
	* libmisc/shell/str2int.c: Removed.

1 files changed, 26 insertions, 4 deletions

diff --git a/cpukit/libmisc/shell/main_mfill.c b/cpukit/libmisc/shell/main_mfill.c
index 605cd58580..1fb027ae4f 100644
--- a/cpukit/libmisc/shell/main_mfill.c
+++ b/cpukit/libmisc/shell/main_mfill.c
@@ -22,6 +22,7 @@
 
 #include <rtems.h>
 #include <rtems/shell.h>
+#include <rtems/stringto.h>
 #include "internal.h"
 
 int rtems_shell_main_mfill(
@@ -29,6 +30,7 @@ int rtems_shell_main_mfill(
   char *argv[]
 )
 {
+  unsigned long tmp;
   uintptr_t     addr;
   size_t        size;
   unsigned char value;
@@ -38,10 +40,30 @@ int rtems_shell_main_mfill(
     return -1;
   }
 
-  addr  = rtems_shell_str2int(argv[1]);
-  size  = rtems_shell_str2int(argv[2]);
-  value = rtems_shell_str2int(argv[3]) % 0x100;
-  memset((unsigned char*)addr,size,value);
+  /*
+   *  Convert arguments into numbers
+   */
+  if ( !rtems_string_to_unsigned_long(argv[1], &tmp, NULL, 0) ) {
+    printf( "Address argument (%s) is not a number\n", argv[1] );
+    return -1;
+  }
+  addr = (uintptr_t) tmp;
+
+  if ( !rtems_string_to_unsigned_long(argv[2], &tmp, NULL, 0) ) {
+    printf( "Size argument (%s) is not a number\n", argv[2] );
+    return -1;
+  }
+  size = (size_t) tmp;
+
+  if ( !rtems_string_to_unsigned_char(argv[3], &value, NULL, 0) ) {
+    printf( "Value argument (%s) is not a number\n", argv[3] );
+    return -1;
+  }
+
+  /*
+   *  Now fill the memory.
+   */
+  memset((unsigned char*)addr, size, value);
 
   return 0;
 }