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.
This commit is contained in:
Joel Sherrill
2009-07-22 15:17:37 +00:00
parent e8d59ca6af
commit 35d09baa84
15 changed files with 252 additions and 184 deletions

View File

@@ -23,28 +23,37 @@
#include <rtems.h>
#include <rtems/shell.h>
#include <rtems/stringto.h>
#include "internal.h"
/*----------------------------------------------------------------------------*
* RAM MEMORY COMMANDS
*----------------------------------------------------------------------------*/
int rtems_shell_main_mdump(
int argc,
char *argv[]
)
{
unsigned char n, m;
unsigned long tmp;
unsigned char n;
unsigned char m;
int max;
int res;
uintptr_t addr = 0;
unsigned char *pb;
if (argc>1)
addr = rtems_shell_str2int(argv[1]);
if (argc > 1) {
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 (argc>2) {
max = rtems_shell_str2int(argv[2]);
if ( !rtems_string_to_int(argv[1], &max, NULL, 0) ) {
printf( "Length argument (%s) is not a number\n", argv[1] );
return -1;
}
addr = (uintptr_t) tmp;
if (max <= 0) {
max = 1; /* print 1 item if 0 or neg. */
res = 0;
@@ -66,8 +75,8 @@ int rtems_shell_main_mdump(
}
for (m=0; m<max; m++) {
printf("0x%08" PRIXPTR " ", addr);
pb = (unsigned char*) addr;
printf("%p ", pb);
for (n=0;n<=(m==(max-1)?res:0xf);n++)
printf("%02X%c",pb[n],n==7?'-':' ');
for (;n<=0xf;n++)