diff options
Diffstat (limited to 'listamsb.c')
| -rw-r--r-- | listamsb.c | 82 |
1 files changed, 43 insertions, 39 deletions
@@ -7,6 +7,7 @@ #include <ctype.h> #include <sys/stat.h> +#include "atascii.h" #include "amsbtok.h" /* this should always be defined in <stdio.h>, but just in case... */ @@ -80,7 +81,7 @@ const char *self; -char pipe_command[BUFSIZ + 1] = { "a8cat" }; +atascii_ctx actx; int verbosity = 0; /* -v */ int raw_output = 0; /* -a */ @@ -198,7 +199,7 @@ void finish(int rv) { int got = pclose(outfile); verbose(1, "return value from pipe is %d", got); if(got != 0) { - os_err("a8cat child process failed, do you have a8cat on your PATH?"); + os_err("colorize-amsb child process failed, do you have it on your PATH?"); } } else { fclose(outfile); @@ -301,7 +302,13 @@ void unknown_token(int tok) { } void list_char(unsigned char c) { - if(printing) fputc(c, outfile); + if(!printing) return; + if(raw_output) { + fputc(c, outfile); + } else { + char buf[20]; + fputs(atascii_a2utf(&actx, c, buf), outfile); + } } int expand_token(int t, unsigned char *buf); @@ -324,7 +331,13 @@ void list_lineno(int l) { void start_listing(void) { /* AMSB always prints a blank line when it LISTs, so we do, too. unless it's disabled with -n, of course. */ - if(initial_eol) fputc(EOL, outfile); + if(initial_eol) { + if(raw_output) { + fputc(0x9b, outfile); + } else { + fputc('\n', outfile); + } + } } int read_token(int literal); @@ -466,6 +479,11 @@ int next_line(void) { list_char(EOL); + if(!raw_output && (actx.inv)) { + char buf[20]; + fputs(atascii_a2utf(&actx, ATA_CHR_FINISH, buf), outfile); + } + return 1; } @@ -808,9 +826,9 @@ void print_help(void) { puts(" -r: only list lines numbered from *start* to *end*"); puts(" --help, -h: print this help and exit"); puts(" --version: print version number and exit"); - puts(" -i -u -t -m -s: passed to a8cat (try 'a8cat -h')"); + puts(" -i -u -t -m -s: same as a8cat (try 'a8cat -h')"); puts("file must be a tokenized (SAVEd) AMSB file. if not given, reads from stdin."); - puts("if outfile not given, writes to stdout (via pipe to a8cat)"); + puts("if outfile not given, writes to stdout"); } void version(void) { @@ -849,14 +867,8 @@ void get_line_range(const char *arg) { } void parse_args(int argc, char **argv) { - const char *a8cat; - char tmp[10]; - int opt, a8catopt = 0, ropt = 0; - - a8cat = getenv("A8CAT"); - if(!a8cat) a8cat = "a8cat"; - - strncpy(pipe_command, a8cat, BUFSIZ); + int opt, ropt = 0; + int ata_mode = ATA_MODE_UTF8, ata_flags = ATA_FLAG_NONE, a8catopt = 0; if(argc >= 2) { if(strcmp(argv[1], "--help") == 0) { @@ -883,17 +895,11 @@ void parse_args(int argc, char **argv) { case 'M': color = 0; break; case 'h': print_help(); exit(0); case 'r': get_line_range(optarg); ropt++; break; - case 'i': - case 'u': - case 't': - case 'm': - case 's': - a8catopt++; - if(strlen(pipe_command) > (BUFSIZ - 10)) - os_err("too many a8cat options"); - sprintf(tmp, " -%c", opt); - strcat(pipe_command, tmp); - break; + case 'i': ata_flags |= ATA_FLAG_ICS; a8catopt++; break; + case 'u': ata_flags |= ATA_FLAG_UNDERLINE; a8catopt++; break; + case 't': ata_flags |= ATA_FLAG_ICS; a8catopt++; break; + case 'm': ata_mode = ATA_MODE_MAGAZINE; a8catopt++; break; + case 's': ata_flags |= ATA_FLAG_STRIP_INVERSE; a8catopt++; break; default: print_help(); exit(1); } } @@ -910,6 +916,8 @@ void parse_args(int argc, char **argv) { if(!initial_eol || check_only || raw_output || ropt || a8catopt || !color) { warn("-[acimMnrstu] options ignored with -U, -C, or -D"); } + } else if(!raw_output) { + atascii_context_init(&actx, ata_mode, ata_flags); } if(optind >= argc) { @@ -956,22 +964,18 @@ void open_output() { outfile = stdout; verbose(1, "using stdout for output"); } else { - const char *a8cat; - if((a8cat = getenv("A8CAT"))) { - verbose(1, "read A8CAT=%s from environment", a8cat); + if(color) { + verbose(1, "using pipe for output: %s", "colorize-amsb"); + outfile = popen("colorize-amsb", "w"); /* "wb" not allowed! */ + /* we probably never see this error. popen() fails only if + we feed it an invalid mode, or if fork() or pipe() fails, + or I suppose if some idjit has done a "rm -f /bin/sh"... + all other errors are caught at pclose(). */ + if(!outfile) os_err("|%s: %s", "colorize-amsb", strerror(errno)); + need_pclose = 1; } else { - verbose(1, "A8CAT not set in environment, using 'a8cat'"); + outfile = stdout; } - if(color) - strcat(pipe_command, " | colorize-amsb"); - verbose(1, "using pipe for output: %s", pipe_command); - outfile = popen(pipe_command, "w"); /* "wb" not allowed! */ - /* we probably never see this error. popen() fails only if - we feed it an invalid mode, or if fork() or pipe() fails, - or I suppose if some idjit has done a "rm -f /bin/sh"... - all other errors are caught at pclose(). */ - if(!outfile) os_err("|%s: %s", pipe_command, strerror(errno)); - need_pclose = 1; } } |