Cleanup and atexit

3 files changed, 15 insertions, 8 deletions

diff --git a/apps/Makefile b/apps/Makefile
index 2c6c643..1a7aff3 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -5,14 +5,14 @@ CC = ccache ../cross/opt/bin/i686-elf-gcc
 LD = ccache ../cross/opt/bin/i686-elf-ld
 OC = ccache ../cross/opt/bin/i686-elf-objcopy
 
-CFLAGS = $(CFLAGS_DEFAULT) -I../libc/inc/ -I../libgui/inc/ -I../libtxt/inc/ -I../libnet/inc/ -fPIE -Duserspace
+CFLAGS = $(CFLAGS_DEFAULT) -I../libc/inc/ -I../libgui/inc/ -I../libtxt/inc/ -fPIE -Duserspace
 
 all: $(COBJS)
 
 %.o: %.c
 	@mkdir -p ../build/apps/
 	@$(CC) -c $(CFLAGS) $< -o $@
-	@$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ $@ -lgui -ltxt -lnet -lc
+	@$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ $@ -lgui -ltxt -lc
 	@$(OC) -O binary $(@:.o=.elf) ../build/apps/$(@:.o=)
 	@cp $(@:.o=.elf) ../build/apps/$(@:.o=.elf)
 
diff --git a/apps/init.c b/apps/init.c
index 5a233c1..35d296b 100644
--- a/apps/init.c
+++ b/apps/init.c
@@ -4,8 +4,6 @@
 #include <def.h>
 #include <sys.h>
 
-#include <cpu.h>
-
 int main(int argc, char **argv)
 {
 	UNUSED(argc);
diff --git a/apps/wm.c b/apps/wm.c
index 8916abf..e445528 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -350,10 +350,23 @@ static void handle_message(void *msg)
 	}
 }
 
+static void handle_exit(void)
+{
+	if (keymap)
+		free(keymap);
+	if (windows)
+		list_destroy(windows);
+	if (screen.fb)
+		memset(screen.fb, COLOR_RED, screen.height * screen.pitch);
+}
+
 int main(int argc, char **argv)
 {
 	UNUSED(argc);
 	UNUSED(argv);
+
+	atexit(handle_exit);
+
 	assert(ioctl("/dev/fb", IO_FB_GET, &screen) == 0);
 	log("WM loaded: %dx%d\n", screen.width, screen.height);
 	wm_client = (struct client){ .pid = getpid() };
@@ -408,9 +421,5 @@ int main(int argc, char **argv)
 		panic("Poll/read error: %s\n", strerror(errno));
 	}
 
-	// TODO: Execute?
-	free(keymap);
-	list_destroy(windows);
-
 	return 0;
 }