6502
/
dcc6502
mirror of https://github.com/tcarmelveilleux/dcc6502.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed argument error handling and usage message

This commit is contained in:
Tennessee Carmel-Veilleux 2014-07-24 23:18:00 -04:00
parent aa6c897c1a
commit 6f0226a7e6
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dcc6502.c
View File

@ -609,7 +609,7 @@ static void version(void) {
} }
static void usage(void) { static void usage(void) {
fprintf(stderr, "Usage: dcc6502 [options] FILENAME"); fprintf(stderr, "\nUsage: dcc6502 [options] FILENAME\n");
fprintf(stderr, " -?/-h : Show this help message\n"); fprintf(stderr, " -?/-h : Show this help message\n");
fprintf(stderr, " -o ORIGIN : Set the origin (base address of disassembly) [default: 0x8000]\n"); fprintf(stderr, " -o ORIGIN : Set the origin (base address of disassembly) [default: 0x8000]\n");
fprintf(stderr, " -m NUM_BYTES : Only disassemble the first NUM_BYTES bytes\n"); fprintf(stderr, " -m NUM_BYTES : Only disassemble the first NUM_BYTES bytes\n");
@ -620,17 +620,18 @@ static void usage(void) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
static unsigned long str_arg_to_ulong(char *str, unsigned long default_val) { static int str_arg_to_ulong(char *str, unsigned long *value) {
uint32_t tmp = 0; uint32_t tmp = 0;
char *endptr;
errno = EOK; errno = EOK;
tmp = strtoul(str, NULL, 0); tmp = strtoul(str, &endptr, 0);
/* In case of conversion error, take default value */ /* In case of conversion error, return error indication */
if (EOK != errno) { if ((EOK != errno) || (*endptr != '\0')) {
fprintf(stderr, "WARNING -> error converting %s to a numerical value.", str); return 0;
return default_val;
} else { } else {
return tmp; *value = tmp;
return 1;
} }
} }
@ -645,6 +646,7 @@ static void usage_and_exit(int exit_code, const char *message) {
static void parse_args(int argc, char *argv[], options_t *options) { static void parse_args(int argc, char *argv[], options_t *options) {
int arg_idx = 1; int arg_idx = 1;
unsigned long tmp_value;
options->cycle_counting = 0; options->cycle_counting = 0;
options->hex_output = 0; options->hex_output = 0;
@ -684,7 +686,10 @@ static void parse_args(int argc, char *argv[], options_t *options) {
/* Get argument and parse it */ /* Get argument and parse it */
arg_idx++; arg_idx++;
options->org = (uint16_t)(str_arg_to_ulong(argv[arg_idx], 0x8000u) & 0xFFFFu); if (!str_arg_to_ulong(argv[arg_idx], &tmp_value)) {
usage_and_exit(1, "Invalid argument to -o switch");
}
options->org = (uint16_t)(tmp_value & 0xFFFFu);
break; break;
case 'm': case 'm':
if ((arg_idx == (argc - 1)) || (argv[arg_idx + 1][0] == '-')) { if ((arg_idx == (argc - 1)) || (argv[arg_idx + 1][0] == '-')) {
@ -693,7 +698,10 @@ static void parse_args(int argc, char *argv[], options_t *options) {
/* Get argument and parse it */ /* Get argument and parse it */
arg_idx++; arg_idx++;
options->max_num_bytes = str_arg_to_ulong(argv[arg_idx], 65536u); if (!str_arg_to_ulong(argv[arg_idx], &tmp_value)) {
usage_and_exit(1, "Invalid argument to -m switch");
}
options->max_num_bytes = tmp_value;
break; break;
default: default:
version(); version();