From 773e85c681ee4faecf353de7066b536f1a50ff61 Mon Sep 17 00:00:00 2001
From: minus <minus@mnus.de>
Date: Wed, 19 Aug 2015 01:35:01 +0200
Subject: properly handle IPC clients

---
 sway/log.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'sway/log.c')

diff --git a/sway/log.c b/sway/log.c
index 2d633abb..e8c1b78f 100644
--- a/sway/log.c
+++ b/sway/log.c
@@ -5,6 +5,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <signal.h>
+#include <errno.h>
+#include <string.h>
 
 int colored = 1;
 int v = 0;
@@ -66,6 +68,34 @@ void sway_log(int verbosity, const char* format, ...) {
 	}
 }
 
+void sway_log_errno(int verbosity, char* format, ...) {
+	if (verbosity <= v) {
+		int c = verbosity;
+		if (c > sizeof(verbosity_colors) / sizeof(char *)) {
+			c = sizeof(verbosity_colors) / sizeof(char *) - 1;
+		}
+
+		if (colored) {
+			fprintf(stderr, verbosity_colors[c]);
+		}
+
+		va_list args;
+		va_start(args, format);
+		vfprintf(stderr, format, args);
+		va_end(args);
+
+		fprintf(stderr, ": ");
+		char error[256];
+		strerror_r(errno, error, sizeof(error));
+		fprintf(stderr, error);
+
+		if (colored) {
+			fprintf(stderr, "\x1B[0m");
+		}
+		fprintf(stderr, "\n");
+	}
+}
+
 bool sway_assert(bool condition, const char* format, ...) {
 	if (condition) {
 		return true;
-- 
cgit v1.2.3


From f26ed32e460f3007e623c529d28562f4a0b261cd Mon Sep 17 00:00:00 2001
From: minus <minus@mnus.de>
Date: Thu, 20 Aug 2015 15:12:34 +0200
Subject: added sway_terminate to exit cleanly

---
 sway/log.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sway/log.c')

diff --git a/sway/log.c b/sway/log.c
index e8c1b78f..6e01421b 100644
--- a/sway/log.c
+++ b/sway/log.c
@@ -1,4 +1,5 @@
 #include "log.h"
+#include "sway.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -42,7 +43,7 @@ void sway_abort(const char *format, ...) {
 	vfprintf(stderr, format, args);
 	va_end(args);
 	fprintf(stderr, "\n");
-	exit(1);
+	sway_terminate();
 }
 
 void sway_log(int verbosity, const char* format, ...) {
-- 
cgit v1.2.3