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, 36 insertions, 13 deletions

diff --git a/cpukit/libmisc/shell/main_mmove.c b/cpukit/libmisc/shell/main_mmove.c
index a97f0ebfa5..f68f4a2ab6 100644
--- a/cpukit/libmisc/shell/main_mmove.c
+++ b/cpukit/libmisc/shell/main_mmove.c
@@ -22,6 +22,7 @@
 
 #include <rtems.h>
 #include <rtems/shell.h>
+#include <rtems/stringto.h>
 #include "internal.h"
 
 extern int rtems_shell_main_mdump(int, char *);
@@ -31,19 +32,41 @@ int rtems_shell_main_mmove(
   char *argv[]
 )
 {
- uintptr_t  src;
- uintptr_t  dst;
- size_t     length;
-
- if ( argc<4 ) {
-  fprintf(stderr,"%s: too few arguments\n", argv[0]);
-  return -1;
- }
-
- dst    = rtems_shell_str2int(argv[1]);
- src    = rtems_shell_str2int(argv[2]);
- length = rtems_shell_str2int(argv[3]);
- memcpy((unsigned char*)dst, (unsigned char*)src, length);
+  unsigned long tmp;
+  uintptr_t     src;
+  uintptr_t     dst;
+  size_t        length;
+
+  if ( argc < 4 ) {
+    fprintf(stderr,"%s: too few arguments\n", argv[0]);
+    return -1;
+   }
+
+  /*
+   *  Convert arguments into numbers
+   */
+  if ( !rtems_string_to_unsigned_long(argv[1], &tmp, NULL, 0) ) {
+    printf( "Destination argument (%s) is not a number\n", argv[1] );
+    return -1;
+  }
+  dst = (uintptr_t) tmp;
+
+  if ( !rtems_string_to_unsigned_long(argv[2], &tmp, NULL, 0) ) {
+    printf( "Source argument (%s) is not a number\n", argv[2] );
+    return -1;
+  }
+  src = (uintptr_t) tmp;
+
+  if ( !rtems_string_to_unsigned_long(argv[3], &tmp, NULL, 0) ) {
+    printf( "Length argument (%s) is not a number\n", argv[3] );
+    return -1;
+  }
+  length = (size_t) tmp;
+
+  /*
+   *  Now copy the memory.
+   */
+  memcpy((unsigned char*)dst, (unsigned char*)src, length);
 
  return 0;
 }