X-Git-Url: https://git.danieliu.xyz/?p=dwm.git;a=blobdiff_plain;f=util.c;h=fe044fc7b7978d1f3c23768e315aae415d90b11a;hp=2414b394fc7a2fe81b5b3043ea1c937be7cb9e2d;hb=HEAD;hpb=d4b7a9a3735deeab639f28b5bb2f568e0dc49616

diff --git a/util.c b/util.c
index 2414b39..fe044fc 100644
--- a/util.c
+++ b/util.c
@@ -1,74 +1,35 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-#include "dwm.h"
+/* See LICENSE file for copyright and license details. */
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/wait.h>
-#include <unistd.h>
+#include <string.h>
 
-/* static */
-
-static void
-bad_malloc(unsigned int size)
-{
-	eprint("fatal: could not malloc() %u bytes\n", size);
-}
-
-/* extern */
+#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);
-}
 
-void *
-erealloc(void *ptr, unsigned int size)
-{
-	void *res = realloc(ptr, size);
-	if(!res)
-		bad_malloc(size);
-	return res;
-}
-
-void
-spawn(Arg *arg)
-{
-	static char *shell = NULL;
-
-	if(!shell && !(shell = getenv("SHELL")))
-		shell = "/bin/sh";
-
-	if(!arg->cmd)
-		return;
-	if(fork() == 0) {
-		if(fork() == 0) {
-			if(dpy)
-				close(ConnectionNumber(dpy));
-			setsid();
-			execl(shell, shell, "-c", arg->cmd, NULL);
-			fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg->cmd);
-			perror(" failed");
-		}
-		exit(0);
+	if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
+		fputc(' ', stderr);
+		perror(NULL);
+	} else {
+		fputc('\n', stderr);
 	}
-	wait(0);
+
+	exit(1);
 }