SuperNovaa41/xxd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improves the colour changes a bit

Browse Source
This commit is contained in:
SuperNovaa41 2025-02-07 11:27:42 -05:00
parent b572901837
commit e8326d0e9b
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/hex.c
View File

@ -50,23 +50,30 @@ void convert_text_to_hex(hex_chunk_t* chunk)
void display_hex_chunk(hex_chunk_t* chunk, FILE* stream) void display_hex_chunk(hex_chunk_t* chunk, FILE* stream)
{ {
uint i, j; uint i, j;
bool newline;
fprintf(stream, "%08x: \x1b[32m", chunk->line * flags.cols); fprintf(stream, "%08x: %s", chunk->line * flags.cols, GREEN_TEXT_STR);
newline = false;
for (i = 0; i < (flags.cols * 2); i += (flags.octets * 2)) { for (i = 0; i < (flags.cols * 2); i += (flags.octets * 2)) {
for (j = 0; j < (flags.octets * 2); j += 2) { for (j = 0; j < (flags.octets * 2); j += 2) {
if (((chunk->hex + i) + j)[0] == '0' && ((chunk->hex + i) + j)[1] == 'a') if (((chunk->hex + i) + j)[0] == '0' &&
fprintf(stream, "\x1b[33m%2.2s\x1b[32m", chunk->hex + i + j); ((chunk->hex + i) + j)[1] == 'a')
else newline = true;
fprintf(stream, "%2.2s", chunk->hex + i + j);
fprintf(stream, "%s%2.2s%s", (newline ? YELLOW_TEXT_STR : ""), chunk->hex + i + j, (newline ? GREEN_TEXT_STR : ""));
} }
fprintf(stream, " "); fprintf(stream, " ");
newline = false;
} }
for (i = 0; i < flags.cols; i++) { for (i = 0; i < flags.cols; i++) {
if (chunk->text[i] == '\n' || chunk->text[i] == EOF) if (chunk->text[i] == '\n' || chunk->text[i] == EOF)
fprintf(stream, "\x1b[33m.\x1b[32m"); newline = true;
else
fprintf(stream, "%c", chunk->text[i]); fprintf(stream, "%s%c%s", (newline ? YELLOW_TEXT_STR : ""),
(newline ? '.' : chunk->text[i]), (newline ? GREEN_TEXT_STR : ""));
newline = false;
} }
fprintf(stream, "\x1b[0m\n"); fprintf(stream, RESET_TEXT_STR);
} }

12
src/include/hex.h
View File

@ -8,6 +8,10 @@
#define TEXT_LINE_LEN 16 #define TEXT_LINE_LEN 16
#define HEX_LINE_LEN 32 #define HEX_LINE_LEN 32
#define GREEN_TEXT_STR "\x1b[32m"
#define YELLOW_TEXT_STR "\x1b[33m"
#define RESET_TEXT_STR "\x1b[0m\n"
typedef struct { typedef struct {
int line; int line;
char* text; char* text;
@ -17,11 +21,11 @@ typedef struct {
struct flags { struct flags {
bool autoskip; // should we condense null lines into * bool autoskip; // should we condense null lines into *
bool binary; // do binary dump instead of hex bool binary; // do binary dump instead of hex
uint cols; // choose the amount of columns to display (default 16) uint cols; // choose the amount of columns to display (default 16) // done
uint octets; // number of octets per line (default 2) uint octets; // number of octets per line (default 2) // done
int len; // max len to stop at int len; // max len to stop at //done
bool uppercase; // do uppercase hex chars bool uppercase; // do uppercase hex chars // done
bool decimaloffset; // do decimal offset instead of hex bool decimaloffset; // do decimal offset instead of hex
}; };