#include <readline/readline.h>
#include "dcpu16.h"
+#include "common.h"
/*
* shell-like driver for dcpu16 core
}
}
-/* simplified strtoul with range checking */
-static
-int str_to_word_(char *s) {
- unsigned long l;
- char *ep;
-
- assert(s);
-
- errno = 0;
- l = strtoul(s, &ep, 0);
-
- if (errno
- || !(*s && *ep == '\0') ) {
- /* out of range of conversion, or invalid character encountered */
- return -1;
- }
-
- if (l >= DCPU16_RAM) {
- /* out of range for our needs */
- errno = ERANGE;
- return -1;
- }
-
- return l;
-}
/* flense a buffer into a newly-allocated argument list */
-/* FIXME: handle quotes */
static
int buf_tok_vect_(char ***v, int *c, char *buf) {
const char *sep = " \t";
+ const char *quot = "\"'`";
const size_t v_grow = 32;
size_t v_sz = 32;
- char *st;
+ char *st, *qt;
*c = 0;
*v = malloc(v_sz * sizeof **v);
return -1;
}
- for ( (*v)[*c] = strtok_r(buf, sep, &st);
+ for ( (*v)[*c] = strqtok_r(buf, sep, '\\', quot, &qt, &st);
(*v)[*c];
- (*v)[*c] = strtok_r(NULL, sep, &st)
+ (*v)[*c] = strqtok_r(NULL, sep, '\\', quot, &qt, &st)
) {
(*c)++;
int addr = 0;
if (arg_count > 2) {
- addr = str_to_word_(arg_vector[2]);
+ addr = str_to_word(arg_vector[2]);
if (addr < 0) {
fprintf(stderr, "address '%s' is not a valid word: %s\n", arg_vector[2], strerror(errno));
return 0;
int i;
for (i = 1; i < arg_count; i++) {
- addr[i-1] = str_to_word_(arg_vector[i]);
+ addr[i-1] = str_to_word(arg_vector[i]);
if (addr[i-1] < 0) {
fprintf(stderr, "address '%s' is not a valid word: %s\n", arg_vector[i], strerror(errno));
return 0;
int i;
for (i = 1; i < arg_count; i++) {
- addr[i-1] = str_to_word_(arg_vector[i]);
+ addr[i-1] = str_to_word(arg_vector[i]);
if (addr[i-1] < 0) {
fprintf(stderr, "address '%s' is not a valid word: %s\n", arg_vector[i], strerror(errno));
return 0;