X-Git-Url: https://git.danieliu.xyz/?p=dwm.git;a=blobdiff_plain;f=util.c;h=fe044fc7b7978d1f3c23768e315aae415d90b11a;hp=435069f9903703412fe2edfc3514058d01014959;hb=HEAD;hpb=439e15d09f6fa9271d3b49ef97194f0c80ebe161

diff --git a/util.c b/util.c
index 435069f..fe044fc 100644
--- a/util.c
+++ b/util.c
@@ -1,100 +1,35 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
+/* See LICENSE file for copyright and license details. */
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
 
 #include "util.h"
 
-void
-error(char *errstr, ...) {
-	va_list ap;
-	va_start(ap, errstr);
-	vfprintf(stderr, errstr, ap);
-	va_end(ap);
-	exit(1);
-}
-
-static void
-bad_malloc(unsigned int size)
-{
-	fprintf(stderr, "fatal: could not malloc() %d bytes\n",
-			(int) size);
-	exit(1);
-}
-
-void *
-emallocz(unsigned int size)
-{
-	void *res = calloc(1, size);
-	if(!res)
-		bad_malloc(size);
-	return res;
-}
-
-void *
-emalloc(unsigned int size)
-{
-	void *res = malloc(size);
-	if(!res)
-		bad_malloc(size);
-	return res;
-}
-
 void *
-erealloc(void *ptr, unsigned int size)
+ecalloc(size_t nmemb, size_t size)
 {
-	void *res = realloc(ptr, size);
-	if(!res)
-		bad_malloc(size);
-	return res;
-}
+	void *p;
 
-char *
-estrdup(const char *str)
-{
-	void *res = strdup(str);
-	if(!res)
-		bad_malloc(strlen(str));
-	return res;
+	if (!(p = calloc(nmemb, size)))
+		die("calloc:");
+	return p;
 }
 
 void
-failed_assert(char *a, char *file, int line)
-{
-	fprintf(stderr, "Assertion \"%s\" failed at %s:%d\n", a, file, line);
-	abort();
-}
+die(const char *fmt, ...) {
+	va_list ap;
 
-void
-swap(void **p1, void **p2)
-{
-	void *tmp = *p1;
-	*p1 = *p2;
-	*p2 = tmp;
-}
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
 
-void
-spawn(Display *dpy, const char *shell, const char *cmd)
-{
-	if(!cmd || !shell)
-		return;
-	if(fork() == 0) {
-		if(fork() == 0) {
-			if(dpy)
-				close(ConnectionNumber(dpy));
-			execl(shell, shell, "-c", cmd, (const char *)0);
-			fprintf(stderr, "gridwm: execl %s", shell);
-			perror(" failed");
-		}
-		exit (0);
+	if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
+		fputc(' ', stderr);
+		perror(NULL);
+	} else {
+		fputc('\n', stderr);
 	}
-	wait(0);
+
+	exit(1);
 }