From 4d794cd69d5308a88a2453f3613260f0db8be8a7 Mon Sep 17 00:00:00 2001
From: clsr <clsr@clsr.net>
Date: Sun, 9 Jun 2019 13:44:41 +0200
Subject: Handle XOpenDisplay failure and close std{in,out,err} when run

---
 config.def.mk |  2 +-
 dwmclock.c    | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/config.def.mk b/config.def.mk
index 2ce7e98..0d5d03d 100644
--- a/config.def.mk
+++ b/config.def.mk
@@ -33,7 +33,7 @@ CFLAGS+=-DEXACT_SLEEP
 CC?=gcc
 
 # compiler flags
-CFLAGS+=-std=c99 -Wall -Wextra -pedantic -O2 $(shell pkg-config --cflags x11)
+CFLAGS+=-std=c99 -Wall -Wextra -pedantic -Os $(shell pkg-config --cflags x11)
 LDFLAGS+=$(shell pkg-config --libs x11)
 
 # default paths
diff --git a/dwmclock.c b/dwmclock.c
index 95d9679..95a0db0 100644
--- a/dwmclock.c
+++ b/dwmclock.c
@@ -91,11 +91,19 @@ int main(void)
 	sigaction(SIGQUIT, &act, NULL);
 	sigaction(SIGTERM, &act, NULL);
 
-	disp = XOpenDisplay(NULL);
+	if (!(disp = XOpenDisplay(NULL))) {
+		return EXIT_FAILURE;
+	}
 	screen = DefaultScreen(disp);
-	root = RootWindow(disp, screen);
+	if (!(root = RootWindow(disp, screen))) {
+		return EXIT_FAILURE;
+	}
 	XFetchName(disp, root, &origname);
 
+	fclose(stdin);
+	fclose(stdout);
+	fclose(stderr);
+
 #ifdef BATTERY
 	for (i=0; !stop; ++i) {
 #else
@@ -155,5 +163,5 @@ int main(void)
 	}
 	XCloseDisplay(disp);
 
-	return 0;
+	return EXIT_SUCCESS;
 }
-- 
cgit