1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
|
commit 411339dc4eded08e95bc70860873c3632a92bb1b
Author: ingenarel (NeoJesus) <ingenarel_neojesus@disroot.org>
Date: Mon Oct 19 07:55:22 2026 +0600
DEFAULT PATCHES
Signed-off-by: ingenarel (NeoJesus) <ingenarel_neojesus@disroot.org>
diff --git a/Makefile b/Makefile
index 8ba7bd0..a17f446 100644
--- a/Makefile
+++ b/Makefile
@@ -2,16 +2,7 @@
OPTFLAGS ?= -O2 -finline-functions
WARNFLAGS ?= -Wall -Wextra -Wpedantic -Wshadow -Werror -Wfatal-errors -Wconversion -Wsign-conversion -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
-CFLAGS ?= -std=c99 -pipe -fPIC $(OPTFLAGS) $(WARNFLAGS)
-
-UNAME_S := $(shell uname -s)
-ifeq ($(UNAME_S),Darwin)
- CFLAGS += -fstack-protector-strong -D_GNU_SOURCE
-else ifeq ($(OS),Windows_NT)
- CFLAGS += -D_WIN32 -s
-else
- CFLAGS += -fstack-protector-strong -D_GNU_SOURCE -fno-plt -Wl,-z,now -D_FORTIFY_SOURCE=3
-endif
+CFLAGS += -std=c11 -D_GNU_SOURCE
PREFIX ?= /usr
BINDIR ?= $(PREFIX)/bin
@@ -23,13 +14,10 @@ RELEASE_TARBALL := $(RELEASE_DIR).tar.gz
RELEASE_FILES := main.c Makefile COPYING README.md
tinyxxd: main.c
- $(CC) $(CFLAGS) -o $@ $<
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
tinyxxd_debug: main.c
- $(CC) $(CFLAGS) -g -o $@ $<
-
-tinyxxd_asan: main.c
- $(CC) $(CFLAGS) -g -fsanitize=address,undefined -o $@ $<
+ $(CC) $(CFLAGS) $(LDFLAGS) -g -o $@ $<
profile: tinyxxd_debug
dd if=/dev/random of=sample.bin bs=1M count=1
@@ -48,7 +36,7 @@ benchfull:
fmt: main.c
clang-format -style=WebKit -i main.c
-test: xxd tinyxxd_asan
+test:
@echo 'Preparing tests...'
@echo -n 'This is a test file' > sample.bin
@printf '\x00\x09\x0a\x0d\x20\x41\x7e\x7f\x80\xff' > colorbytes.bin
@@ -92,8 +80,8 @@ test: xxd tinyxxd_asan
run_test:
@echo "Running test: $(DESC)"
- @./tinyxxd_asan $(CMD) > tinyxxd_output.txt
- @./xxd $(CMD) > xxd_output.txt
+ @./tinyxxd $(CMD) > tinyxxd_output.txt
+ @xxd $(CMD) > xxd_output.txt
@if diff -q tinyxxd_output.txt xxd_output.txt > /dev/null; then \
echo 'Test passed'; \
else \
@@ -103,8 +91,8 @@ run_test:
verify_conversion_test:
@echo "Running conversion and verification test..."
- @./tinyxxd_asan sample.bin > sample_tinyxxd.bin
- @./tinyxxd_asan -r sample_tinyxxd.bin > sample_restored.bin
+ @./tinyxxd sample.bin > sample_tinyxxd.bin
+ @./tinyxxd -r sample_tinyxxd.bin > sample_restored.bin
@if diff -q sample.bin sample_restored.bin > /dev/null; then \
echo -e "\033[0;32mConversion and verification test passed\033[0m"; \
else \
@@ -116,7 +104,7 @@ verify_conversion_test:
test_revert_crlf:
@echo "Running test: Revert hex dump with CRLF line endings"
@printf "00000000: 3132 3334\r\n00000004: 3536 3738\r\n" > repro_crlf.hex
- @./tinyxxd_asan -r repro_crlf.hex > repro_crlf.bin
+ @./tinyxxd -r repro_crlf.hex > repro_crlf.bin
@printf "12345678" > expected_crlf.bin
@if diff -q repro_crlf.bin expected_crlf.bin > /dev/null; then \
echo 'Test passed'; \
@@ -129,7 +117,7 @@ test_revert_crlf:
test_le_padding:
@echo "Running test: Little-endian hex dump with padding"
@printf "ABCDEFG" > 7.bin
- @./tinyxxd_asan -e -c 8 7.bin > le_padding_output.txt
+ @./tinyxxd -e -c 8 7.bin > le_padding_output.txt
@printf "00000000: 44434241 474645 ABCDEFG\n" > le_padding_expected.txt
@if diff -q le_padding_output.txt le_padding_expected.txt > /dev/null; then \
echo 'Test passed'; \
@@ -142,7 +130,7 @@ test_le_padding:
test_help_stdout:
@echo "Running test: -h outputs to stdout"
- @if ./tinyxxd_asan -h 2>/dev/null | grep -q 'Usage'; then \
+ @if ./tinyxxd -h 2>/dev/null | grep -q 'Usage'; then \
echo 'Test passed'; \
else \
echo 'Test failed: -h should write to stdout'; \
@@ -151,7 +139,7 @@ test_help_stdout:
test_error_stderr:
@echo "Running test: bad option outputs to stderr"
- @if ./tinyxxd_asan -Z 2>&1 >/dev/null | grep -q 'Usage'; then \
+ @if ./tinyxxd -Z 2>&1 >/dev/null | grep -q 'Usage'; then \
echo 'Test passed'; \
else \
echo 'Test failed: bad option should write to stderr'; \
|
