From f97dabd478d498a39b8384f72883a257949b5529 Mon Sep 17 00:00:00 2001 From: June McEnroe Date: Sun, 16 Jul 2017 21:16:16 -0400 Subject: Remove color from xx, group ASCII --- home/.bin/xx.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/home/.bin/xx.c b/home/.bin/xx.c index 1c77fcd5..78d8db4c 100755 --- a/home/.bin/xx.c +++ b/home/.bin/xx.c @@ -21,16 +21,11 @@ static bool allZero(const uint8_t *buf, size_t len) { enum { FLAG_ASCII = 1 << 0, - FLAG_COLOR = 1 << 1, - FLAG_OFFSET = 1 << 2, - FLAG_SKIP = 1 << 3, - FLAG_UNDUMP = 1 << 4, + FLAG_OFFSET = 1 << 1, + FLAG_SKIP = 1 << 2, + FLAG_UNDUMP = 1 << 3, }; -static void color(size_t i) { - printf("\x1b[%c%cm", (i % 8) ? '3' : '9', (char)(i % 8 + '0')); -} - static void dump(size_t cols, size_t group, uint8_t flags, FILE *file) { uint8_t buf[cols]; size_t offset = 0, len = 0; @@ -39,8 +34,6 @@ static void dump(size_t cols, size_t group, uint8_t flags, FILE *file) { len = fread(buf, 1, sizeof(buf), file); if (!len) break; - if (flags & FLAG_COLOR) printf("\x1b[39m"); - if ((flags & FLAG_SKIP) && len == sizeof(buf)) { static bool skip; if (allZero(buf, len)) { @@ -57,7 +50,6 @@ static void dump(size_t cols, size_t group, uint8_t flags, FILE *file) { for (size_t i = 0; i < len; ++i) { if (group && i && !(i % group)) printf(" "); - if (flags & FLAG_COLOR) color(i); printf("%02x ", buf[i]); } @@ -67,7 +59,7 @@ static void dump(size_t cols, size_t group, uint8_t flags, FILE *file) { } printf(" "); for (size_t i = 0; i < len; ++i) { - if (flags & FLAG_COLOR) color(i); + if (group && i && !(i % group)) printf(" "); printf("%c", isprint(buf[i]) ? buf[i] : '.'); } } @@ -93,17 +85,16 @@ int main(int argc, char *argv[]) { char *path = NULL; int opt; - while (0 < (opt = getopt(argc, argv, "aCc:fg:hku"))) { + while (0 < (opt = getopt(argc, argv, "ac:fg:hku"))) { switch (opt) { case 'a': flags ^= FLAG_ASCII; break; - case 'C': flags ^= FLAG_COLOR; break; case 'f': flags ^= FLAG_OFFSET; break; case 'k': flags ^= FLAG_SKIP; break; case 'u': flags ^= FLAG_UNDUMP; break; case 'c': cols = strtoul(optarg, NULL, 10); break; case 'g': group = strtoul(optarg, NULL, 10); break; default: - fprintf(stderr, "usage: xx [-aCfku] [-c cols] [-g group] [file]\n"); + fprintf(stderr, "usage: xx [-afku] [-c cols] [-g group] [file]\n"); return (opt == 'h') ? EX_OK : EX_USAGE; } } -- cgit 1.4.1 4&follow=1'>git: update to v2.3.1Christian Hesse 2015-02-15Bump verisonJason A. Donenfeld 2015-02-15shrink cgit.png file sizeChristian Hesse 2015-02-09ui-clone.c: Fix off-by-one error in pack pathJason A. Donenfeld 2015-02-09ui-clone.c: Fix path checkLukas Fleischer 2015-02-08git: update for v2.3.0Christian Hesse 2015-02-05ui-shared.c: Refactor add_clone_urls()Lukas Fleischer 2015-01-29Add repo.hide and repo.ignoreLukas Fleischer 2015-01-28Add Etags for snapshotsJanus 2015-01-19tag: reference with "h" instead of "id"John Keeping 2015-01-15Return proper HTTP response when accessing info/Lukas Fleischer 2015-01-13git: update to v2.2.2Christian Hesse 2014-12-30ui-diff: don't link to single file diff statJohn Keeping 2014-12-28ui-patch: match git-format-patch(1) outputJohn Keeping 2014-12-28t0108: modernize styleJohn Keeping 2014-12-24Revert "git: use xz compressed archive for download"Jason A. Donenfeld 2014-12-24Use split_ident_line() in parse_user()Lukas Fleischer 2014-12-23footer: link back to cgit home pageJason A. Donenfeld 2014-12-23ui-shared: show absolute time in tooltip for relative datesJohn Keeping 2014-12-23git: use xz compressed archive for downloadChristian Hesse 2014-12-23match other common markdown file extensionsChris Burroughs 2014-12-23repolist: add owner-filterChris Burroughs 2014-12-23ui-shared: add rel-vcs microformat links to HTML headerJohn Keeping 2014-12-23ui-summary: add "rel='vcs-git'" to clone URL linksJohn Keeping 2014-12-23Extract clone URL printing to ui-shared.cJohn Keeping 2014-12-23Remove trailing slash after remove-suffixLukas Fleischer 2014-12-23git: update to v2.2.1Christian Hesse 2014-12-13filter: fix libravatar email-filter https issueChristian Hesse 2014-12-13ui-diff: add "stat only" diff typeJohn Keeping 2014-12-13Change "ss" diff flag to an enumJohn Keeping 2014-12-13ui-shared: remove toggle_ssdiff arg to cgit_diff_link()John Keeping 2014-12-13ui-shared: remove toggle_ssdiff arg to cgit_commit_link()John Keeping 2014-08-07git: update to v2.0.4John Keeping 2014-08-07Always check if README exists in choose_readme()Lukas Fleischer 2014-08-01cgitrc.5: we mean a cgi response, not requestJason A. Donenfeld 2014-07-28ui-stats.c: set parent pointer to NULL after freeing itJohn Keeping 2014-07-28git: update to v2.0.3John Keeping 2014-07-28parsing.c: make commit buffer constJohn Keeping 2014-06-30Bump version.Jason A. Donenfeld 2014-06-29remove debug fprinf() calls that sneaked in with commit 79c985Christian Hesse 2014-06-28git: update to 2.0.1Christian Hesse 2014-06-28ui-patch: Flush stdout after outputting dataJohn Keeping 2014-06-28ui-log: ignore unhandled argumentsJohn Keeping 2014-06-28git: update for git 2.0Christian Hesse 2014-04-17remove trailing whitespaces from source filesChristian Hesse 2014-04-12git: update to 1.9.2Christian Hesse 2014-04-05Fix cgit_parse_url when a repo url is contained in another repo urlJulian Maurice 2014-03-20Makefile: use more reliable git tarball mirrorJason A. Donenfeld 2014-03-20git: update to 1.9.1Christian Hesse