xan/zxdump
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

A fair amount of progress!

Browse source
This commit is contained in:
XANTRONIX Development 2023-09-11 19:10:48 -04:00
parent dff861680f
commit 8b4a8a933a
1 changed files with 85 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
main.c
View file

@ -6,17 +6,18 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <endian.h>
#include <errno.h> #include <errno.h>
#define ZXDUMP_STRIDE_LINE 16 #define ZX_DUMP_STRIDE_LINE 16
#define ZXDUMP_STRIDE_GROUP 2 #define ZX_DUMP_STRIDE_GROUP 2
#define ZXDUMP_CHARSET_LEN 64 #define ZX_DUMP_CHARSET_LEN 64
#define ZXDUMP_FLAGS_NONE 0 #define ZX_DUMP_FLAGS_NONE 0
#define ZXDUMP_FLAGS_BASIC (1 << 0) #define ZX_DUMP_FLAGS_BASIC (1 << 0)
#define ZX_CHAR_LOW(c) \ #define ZX_CHAR_LOW(c) \
(c <= ZXDUMP_CHARSET_LEN) (c <= ZX_DUMP_CHARSET_LEN)
#define ZX_CHAR_INVERSE_START 0x80 #define ZX_CHAR_INVERSE_START 0x80
#define ZX_CHAR_INVERSE_END 0xbf #define ZX_CHAR_INVERSE_END 0xbf
@ -30,6 +31,9 @@
#define ZX_CHAR_TOKEN_LOW(c) \ #define ZX_CHAR_TOKEN_LOW(c) \
(c >= ZX_CHAR_TOKEN_LOW_START && c <= ZX_CHAR_TOKEN_LOW_END) (c >= ZX_CHAR_TOKEN_LOW_START && c <= ZX_CHAR_TOKEN_LOW_END)
#define ZX_CHAR_NEWLINE(c) \
(c == 0x76)
#define ZX_CHAR_TOKEN_HIGH_START 0xc0 #define ZX_CHAR_TOKEN_HIGH_START 0xc0
#define ZX_CHAR_TOKEN_HIGH_END 0xff #define ZX_CHAR_TOKEN_HIGH_END 0xff
@ -42,7 +46,7 @@ typedef struct _zx_basic_line {
uint16_t num, len; uint16_t num, len;
} zx_basic_line; } zx_basic_line;
static uint32_t zx_charset[ZXDUMP_CHARSET_LEN] = { static uint32_t zx_charset[ZX_DUMP_CHARSET_LEN] = {
0x0020, 0x2598, 0x259d, 0x2580, 0x2596, 0x258c, 0x259e, 0x259b, 0x0020, 0x2598, 0x259d, 0x2580, 0x2596, 0x258c, 0x259e, 0x259b,
0x2592, '.', '.', '"', 0x00a3, '$', ':', '?', 0x2592, '.', '.', '"', 0x00a3, '$', ':', '?',
'(', ')', '>', '<', '=', '+', '-', '*', '(', ')', '>', '<', '=', '+', '-', '*',
@ -128,7 +132,7 @@ static ssize_t hexdump_line(off_t offset, void *buf, size_t len, int tty) {
} }
for (i=0; i<len; i++) { for (i=0; i<len; i++) {
if (i > 0 && (i % ZXDUMP_STRIDE_GROUP) == 0) { if (i > 0 && (i % ZX_DUMP_STRIDE_GROUP) == 0) {
if (putchar(' ') < 0) { if (putchar(' ') < 0) {
goto error_io; goto error_io;
} }
@ -171,7 +175,7 @@ error_io:
return -1; return -1;
} }
static ssize_t hexdump_fd(int fd) { static ssize_t zx_dump_hex(int fd) {
void *buf; void *buf;
ssize_t total = 0; ssize_t total = 0;
int tty = isatty(fileno(stdout)); int tty = isatty(fileno(stdout));
@ -195,9 +199,9 @@ static ssize_t hexdump_fd(int fd) {
break; break;
} }
for (i=0; i<len; i+=ZXDUMP_STRIDE_LINE) { for (i=0; i<len; i+=ZX_DUMP_STRIDE_LINE) {
size_t left = len - i, size_t left = len - i,
linesz = left < ZXDUMP_STRIDE_LINE? left: ZXDUMP_STRIDE_LINE; linesz = left < ZX_DUMP_STRIDE_LINE? left: ZX_DUMP_STRIDE_LINE;
if (hexdump_line(offset, buf, linesz, tty) < 0) { if (hexdump_line(offset, buf, linesz, tty) < 0) {
goto error_hexdump_line; goto error_hexdump_line;
@ -226,17 +230,22 @@ static inline int zx_print(uint8_t c, int tty) {
return zx_putchar(c, 0); return zx_putchar(c, 0);
} else if (ZX_CHAR_TOKEN_LOW(c)) { } else if (ZX_CHAR_TOKEN_LOW(c)) {
return fputs(zx_tokens_low[c - ZX_CHAR_TOKEN_LOW_START], stdout); return fputs(zx_tokens_low[c - ZX_CHAR_TOKEN_LOW_START], stdout);
} else if (ZX_CHAR_NEWLINE(c)) {
return putchar('\n');
} else if (ZX_CHAR_INVERSE(c)) { } else if (ZX_CHAR_INVERSE(c)) {
return zx_putchar(c, tty); return zx_putchar(c - ZX_CHAR_INVERSE_START, tty);
} else if (ZX_CHAR_TOKEN_HIGH(c)) { } else if (ZX_CHAR_TOKEN_HIGH(c)) {
return fputs(zx_tokens[c - ZX_CHAR_TOKEN_HIGH_START], stdout); return fputs(zx_tokens[c - ZX_CHAR_TOKEN_HIGH_START], stdout);
} }
return 0;
} }
static ssize_t basic_dump_fd(int fd) { static ssize_t zx_dump_basic(int fd) {
void *buf; void *buf;
struct stat st;
ssize_t total = 0; ssize_t total = 0;
int tty = isatty(fileno(stdout));
struct stat st;
if (fstat(fd, &st) < 0) { if (fstat(fd, &st) < 0) {
goto error_fstat; goto error_fstat;
@ -246,17 +255,52 @@ static ssize_t basic_dump_fd(int fd) {
goto error_malloc; goto error_malloc;
} }
while (1) { if (lseek(fd, ZX_BASIC_STATE_LEN, SEEK_CUR) < 0) {
ssize_t len, i; goto error_io;
}
if ((len = read(fd, buf, st.st_blksize)) < 0) { while (1) {
goto error_read; ssize_t readlen, len, i;
} else if (len == 0) { zx_basic_line line;
uint8_t last = 0;
if ((readlen = read(fd, &line, sizeof(line))) < 0) {
goto error_io;
} else if (readlen == 0) {
break; break;
} }
for (i=0; i<len; i++) { if (printf("%d", (int)be16toh(line.num)) < 0) {
goto error_io;
}
len = le16toh(line.len);
if (read(fd, buf, len) < 0) {
goto error_io;
}
for (i=0; i<len; i++) {
uint8_t c = ((uint8_t *)buf)[i];
if (ZX_CHAR_TOKEN_LOW(c) || ZX_CHAR_TOKEN_HIGH(c)
|| ZX_CHAR_TOKEN_LOW(last) || ZX_CHAR_TOKEN_HIGH(last)) {
if (putchar(' ') < 0) {
goto error_io;
}
}
if (zx_print(c, tty) < 0) {
goto error_io;
}
last = c;
}
if (!ZX_CHAR_NEWLINE(((uint8_t *)buf)[i-1])) {
if (putchar('\n') < 0) {
goto error_io;
}
} }
} }
@ -264,7 +308,7 @@ static ssize_t basic_dump_fd(int fd) {
return total; return total;
error_read: error_io:
free(buf); free(buf);
error_malloc: error_malloc:
@ -288,7 +332,7 @@ static void usage(const char *prog, char *message, ...) {
int main(int argc, char **argv) { int main(int argc, char **argv) {
int fd, int fd,
flags = ZXDUMP_FLAGS_NONE, flags = ZX_DUMP_FLAGS_NONE,
argn; argn;
while (1) { while (1) {
@ -300,7 +344,7 @@ int main(int argc, char **argv) {
switch (c) { switch (c) {
case 'b': case 'b':
flags |= ZXDUMP_FLAGS_BASIC; flags |= ZX_DUMP_FLAGS_BASIC;
break; break;
case '?': case '?':
@ -323,13 +367,24 @@ int main(int argc, char **argv) {
usage(argv[0], "Too many arguments provided"); usage(argv[0], "Too many arguments provided");
} }
if (hexdump_fd(fd) < 0) { if (flags & ZX_DUMP_FLAGS_BASIC) {
fprintf(stderr, "%s: %s: %s\n", if (zx_dump_basic(fd) < 0) {
argv[0], fprintf(stderr, "%s: %s: %s\n",
(argn == 1)? argv[optind]: "(stdin)", argv[0],
strerror(errno)); (argn == 1)? argv[optind]: "(stdin)",
strerror(errno));
goto error_hexdump_fd; goto error_dump;
}
} else {
if (zx_dump_hex(fd) < 0) {
fprintf(stderr, "%s: %s: %s\n",
argv[0],
(argn == 1)? argv[optind]: "(stdin)",
strerror(errno));
goto error_dump;
}
} }
if (argn == 1) { if (argn == 1) {
@ -338,7 +393,7 @@ int main(int argc, char **argv) {
return 0; return 0;
error_hexdump_fd: error_dump:
if (argn == 1) { if (argn == 1) {
close(fd); close(fd);
} }