From bc8dac927aa790b79c441e8693734c3eea4597f1 Mon Sep 17 00:00:00 2001
From: Bruno Raoult <braoult@gmail.com>
Date: Mon, 19 Sep 2022 20:01:11 +0200
Subject: [PATCH] fix broken Makefile for valgrind + fix day02 memory leak.

---
 2019/day01/Makefile | 29 ++++++++++++++++++++++-------
 2019/day02/Makefile | 29 ++++++++++++++++++++++-------
 2019/day02/aoc-c.c  |  2 +-
 3 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/2019/day01/Makefile b/2019/day01/Makefile
index 04f5b05..234666d 100644
--- a/2019/day01/Makefile
+++ b/2019/day01/Makefile
@@ -40,20 +40,25 @@ CFLAGS  += -Wno-unused-result
 CFLAGS  += -DDEBUG_DEBUG 	# activate general debug (debug.c)
 CFLAGS  += -DDEBUG_POOL		# memory pools management
 
+VALGRIND := valgrind
+VALGRINDFLAGS := -q -s --leak-check=full --show-leak-kinds=all --track-origins=yes
+
+
 TIME    := \time -f "\ttime: %E real, %U user, %S sys\n\tcontext-switch:\t%c+%w, page-faults: %F+%R\n"
 export PATH := .:$(PATH)
 
 .PHONY: clean all compile assembly memcheck memcheck1 memcheck2 ex1 ex2
 
-all: ex1 ex2
+all: README.org ex1 ex2
 
 memcheck: memcheck1
 
-memcheck1:
-	@valgrind -q -s --track-origins=yes aoc-c -p 1 < $(INPUT)
+memcheck1: aoc-c
+	@$(VALGRIND) $(VALGRINDFLAGS) aoc-c -p 1 < $(INPUT)
 
-memcheck2:
-	@valgrind -q -s --track-origins=yes aoc-c -p 2 < $(INPUT)
+memcheck2: aoc-c
+	@$(VALGRIND) $(VALGRINDFLAGS) aoc-c -p 2 < $(INPUT)
+	@#@valgrind -s --track-origins=yes aoc-c -p 2 < $(INPUT)
 
 compile: aoc-c
 
@@ -66,12 +71,22 @@ ex2: aoc-c
 	@$(TIME) aoc-c -p 2 < $(INPUT)
 
 clean:
-	@rm -f aoc-c core* vgcore* gmon.out aoc-c.s
+	@rm -f aoc-c core* vgcore* gmon.out aoc-c.s aoc-c.i README.html
 
 .c:
 	@echo compiling $<
 	@$(CC) $(CFLAGS) $(LDFLAGS) -I $(INCDIR) $< $(LDLIB) -o $@
 
-.c.s:
+# generate pre-processed file (.i) and assembler (.s)
+%.i: %.c
+	@echo generating $@
+	@$(CC) -E $(CFLAGS) -I $(INCDIR) $< -o $@
+
+%.s: %.c
 	@echo generating $@
 	@$(CC) -S -fverbose-asm $(CFLAGS) -I $(INCDIR) $< -o $@
+
+# generate README.org from README.html (must cleanup !)
+%.org: %.html
+	@echo generating $@. Cleanup before commit !
+	@pandoc $< -o $@
diff --git a/2019/day02/Makefile b/2019/day02/Makefile
index 04f5b05..234666d 100644
--- a/2019/day02/Makefile
+++ b/2019/day02/Makefile
@@ -40,20 +40,25 @@ CFLAGS  += -Wno-unused-result
 CFLAGS  += -DDEBUG_DEBUG 	# activate general debug (debug.c)
 CFLAGS  += -DDEBUG_POOL		# memory pools management
 
+VALGRIND := valgrind
+VALGRINDFLAGS := -q -s --leak-check=full --show-leak-kinds=all --track-origins=yes
+
+
 TIME    := \time -f "\ttime: %E real, %U user, %S sys\n\tcontext-switch:\t%c+%w, page-faults: %F+%R\n"
 export PATH := .:$(PATH)
 
 .PHONY: clean all compile assembly memcheck memcheck1 memcheck2 ex1 ex2
 
-all: ex1 ex2
+all: README.org ex1 ex2
 
 memcheck: memcheck1
 
-memcheck1:
-	@valgrind -q -s --track-origins=yes aoc-c -p 1 < $(INPUT)
+memcheck1: aoc-c
+	@$(VALGRIND) $(VALGRINDFLAGS) aoc-c -p 1 < $(INPUT)
 
-memcheck2:
-	@valgrind -q -s --track-origins=yes aoc-c -p 2 < $(INPUT)
+memcheck2: aoc-c
+	@$(VALGRIND) $(VALGRINDFLAGS) aoc-c -p 2 < $(INPUT)
+	@#@valgrind -s --track-origins=yes aoc-c -p 2 < $(INPUT)
 
 compile: aoc-c
 
@@ -66,12 +71,22 @@ ex2: aoc-c
 	@$(TIME) aoc-c -p 2 < $(INPUT)
 
 clean:
-	@rm -f aoc-c core* vgcore* gmon.out aoc-c.s
+	@rm -f aoc-c core* vgcore* gmon.out aoc-c.s aoc-c.i README.html
 
 .c:
 	@echo compiling $<
 	@$(CC) $(CFLAGS) $(LDFLAGS) -I $(INCDIR) $< $(LDLIB) -o $@
 
-.c.s:
+# generate pre-processed file (.i) and assembler (.s)
+%.i: %.c
+	@echo generating $@
+	@$(CC) -E $(CFLAGS) -I $(INCDIR) $< -o $@
+
+%.s: %.c
 	@echo generating $@
 	@$(CC) -S -fverbose-asm $(CFLAGS) -I $(INCDIR) $< -o $@
+
+# generate README.org from README.html (must cleanup !)
+%.org: %.html
+	@echo generating $@. Cleanup before commit !
+	@pandoc $< -o $@
diff --git a/2019/day02/aoc-c.c b/2019/day02/aoc-c.c
index 5ed1d5d..ad9c08f 100644
--- a/2019/day02/aoc-c.c
+++ b/2019/day02/aoc-c.c
@@ -145,6 +145,6 @@ int main(int ac, char **av)
         return usage(*av);
     p = parse();
     printf("%s : res=%d\n", *av, part == 1? part1(p): part2(p));
-
+    free(p);
     exit (0);
 }