X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/d27e3c1092bb53e82c2781798082c354313dde21..523aa08f51a88c59ad4b1f600f8ce3d122e9e289:/util.c?ds=sidebyside

diff --git a/util.c b/util.c
index ff943d0..fe044fc 100644
--- a/util.c
+++ b/util.c
@@ -1,34 +1,35 @@
 /* See LICENSE file for copyright and license details. */
-#include "dmenu.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "util.h"
+
 void *
-emalloc(unsigned int size) {
-	void *res = malloc(size);
+ecalloc(size_t nmemb, size_t size)
+{
+	void *p;
 
-	if(!res)
-		eprint("fatal: could not malloc() %u bytes\n", size);
-	return res;
+	if (!(p = calloc(nmemb, size)))
+		die("calloc:");
+	return p;
 }
 
 void
-eprint(const char *errstr, ...) {
+die(const char *fmt, ...) {
 	va_list ap;
 
-	va_start(ap, errstr);
-	vfprintf(stderr, errstr, ap);
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
 	va_end(ap);
-	exit(EXIT_FAILURE);
-}
 
-char *
-estrdup(const char *str) {
-	void *res = strdup(str);
+	if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
+		fputc(' ', stderr);
+		perror(NULL);
+	} else {
+		fputc('\n', stderr);
+	}
 
-	if(!res)
-		eprint("fatal: could not malloc() %u bytes\n", strlen(str));
-	return res;
+	exit(1);
 }