X-Git-Url: https://git.danieliu.xyz/?p=dmenu.git;a=blobdiff_plain;f=util.c;h=fe044fc7b7978d1f3c23768e315aae415d90b11a;hp=dff7af72ad89391e93ef3889a5825e8a4ba844de;hb=HEAD;hpb=7817523a685f0dbba2e074a448099558a54b1b9c

diff --git a/util.c b/util.c
index dff7af7..fe044fc 100644
--- a/util.c
+++ b/util.c
@@ -1,68 +1,35 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-#include "dmenu.h"
+/* See LICENSE file for copyright and license details. */
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/wait.h>
-#include <unistd.h>
 
-/* static */
-
-static void
-bad_malloc(unsigned int size)
-{
-	eprint("fatal: could not malloc() %u bytes\n", size);
-}
-
-/* extern */
-
-void *
-emalloc(unsigned int size)
-{
-	void *res = malloc(size);
-	if(!res)
-		bad_malloc(size);
-	return res;
-}
+#include "util.h"
 
 void *
-emallocz(unsigned int size)
+ecalloc(size_t nmemb, size_t size)
 {
-	void *res = calloc(1, size);
+	void *p;
 
-	if(!res)
-		bad_malloc(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(!res)
-		bad_malloc(strlen(str));
-	return res;
-}
+	if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
+		fputc(' ', stderr);
+		perror(NULL);
+	} else {
+		fputc('\n', stderr);
+	}
 
-void
-swap(void **p1, void **p2)
-{
-	void *tmp = *p1;
-	*p1 = *p2;
-	*p2 = tmp;
+	exit(1);
 }