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

implements col flag

Browse Source
This commit is contained in:
SuperNovaa41 2025-02-06 23:27:57 -05:00
parent 3919140cf8
commit 6e7f29a2ca
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/hex.c
View File

@ -11,7 +11,7 @@ void init_flags(struct flags* flags)
{ {
flags->autoskip = false; flags->autoskip = false;
flags->binary = false; flags->binary = false;
flags->cols = 16; flags->cols = 4;
flags->octets = 2; flags->octets = 2;
flags->len = -1; // -1 means til EOF flags->len = -1; // -1 means til EOF
flags->uppercase = false; flags->uppercase = false;
@ -27,18 +27,18 @@ void free_hex_chunk(hex_chunk_t* chunk)
void add_text_to_chunk(char* src, char** dst) void add_text_to_chunk(char* src, char** dst)
{ {
*dst = malloc(sizeof(char) * (TEXT_LINE_LEN + 1)); *dst = malloc(sizeof(char) * (flags.cols + 1));
strncpy(*dst, src, 16); strncpy(*dst, src, flags.cols);
(*dst)[TEXT_LINE_LEN] = '\0'; (*dst)[TEXT_LINE_LEN] = '\0';
} }
void convert_text_to_hex(hex_chunk_t* chunk) void convert_text_to_hex(hex_chunk_t* chunk)
{ {
int i, j; uint i, j;
chunk->hex = malloc(sizeof(char) * (HEX_LINE_LEN + 1)); chunk->hex = malloc(sizeof(char) * ((flags.cols * 2) + 1));
for (i = 0, j = 0; i < HEX_LINE_LEN; i += 2, j += 1) { for (i = 0, j = 0; i < (flags.cols * 2); i += 2, j += 1) {
if (chunk->text[j] == '\0') { if (chunk->text[j] == '\0') {
snprintf(chunk->hex + i, 3, " "); snprintf(chunk->hex + i, 3, " ");
} else { } else {
@ -49,10 +49,10 @@ 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)
{ {
int i, j; uint i, j;
fprintf(stream, "%08x: \x1b[32m", chunk->line * 16); fprintf(stream, "%08x: \x1b[32m", chunk->line * flags.cols);
for (i = 0; i < HEX_LINE_LEN; i += 4) { for (i = 0; i < (flags.cols * 2); i += 4) {
for (j = 0; j < 4; j += 2) { for (j = 0; j < 4; j += 2) {
if (((chunk->hex + i) + j)[0] == '0' && ((chunk->hex + i) + j)[1] == 'a') if (((chunk->hex + i) + j)[0] == '0' && ((chunk->hex + i) + j)[1] == 'a')
fprintf(stream, "\x1b[33m%2.2s\x1b[32m", chunk->hex + i + j); fprintf(stream, "\x1b[33m%2.2s\x1b[32m", chunk->hex + i + j);
@ -62,7 +62,7 @@ void display_hex_chunk(hex_chunk_t* chunk, FILE* stream)
fprintf(stream, " "); fprintf(stream, " ");
} }
for (i = 0; i < TEXT_LINE_LEN; 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"); fprintf(stream, "\x1b[33m.\x1b[32m");
else else

11
src/main.c
View File

@ -6,19 +6,19 @@
#include "include/hex.h" #include "include/hex.h"
#include "include/file.h" #include "include/file.h"
struct flags flags;
int get_hex_lines(int len) int get_hex_lines(int len)
{ {
int out; int out;
out = len / 16; out = len / (flags.cols);
if (len % 16 != 0) // if we have a less than a full line remaining if (len % (flags.cols) != 0) // if we have a less than a full line remaining
out++; out++;
return out; return out;
} }
struct flags flags;
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
char* file_content; char* file_content;
@ -42,7 +42,6 @@ int main(int argc, char* argv[])
outfile = true; outfile = true;
} }
read_file_to_buf(argv[1], &file_content); read_file_to_buf(argv[1], &file_content);
filesize = (flags.len == -1) ? strlen(file_content) : flags.len; filesize = (flags.len == -1) ? strlen(file_content) : flags.len;
@ -54,7 +53,7 @@ int main(int argc, char* argv[])
for (i = 0; i < hex_lines; i++) { for (i = 0; i < hex_lines; i++) {
lines[i].line = i; lines[i].line = i;
add_text_to_chunk(file_content + (i * 16), &(lines[i].text)); add_text_to_chunk(file_content + (i * (flags.cols)), &(lines[i].text));
convert_text_to_hex(&lines[i]); convert_text_to_hex(&lines[i]);
} }