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

diff --git a/util.c b/util.c
index 3e5fd1e..fe044fc 100644
--- a/util.c
+++ b/util.c
@@ -1,61 +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)
-{
-	fprintf(stderr, "fatal: could not malloc() %d bytes\n",
-			(int) size);
-	exit(1);
-}
-
-/* extern */
+#include "util.h"
 
 void *
-emallocz(unsigned int size)
+ecalloc(size_t nmemb, size_t size)
 {
-	void *res = calloc(1, size);
-	if(!res)
-		bad_malloc(size);
-	return res;
+	void *p;
+
+	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(1);
-}
 
-void
-spawn(Arg *arg)
-{
-	char **argv = (char **)arg->argv;
-	if(!argv || !argv[0])
-		return;
-	if(fork() == 0) {
-		if(fork() == 0) {
-			if(dpy)
-				close(ConnectionNumber(dpy));
-			setsid();
-			execvp(argv[0], argv);
-			fprintf(stderr, "dwm: execvp %s", argv[0]);
-			perror(" failed");
-		}
-		exit (0);
+	if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
+		fputc(' ', stderr);
+		perror(NULL);
+	} else {
+		fputc('\n', stderr);
 	}
-	wait(0);
+
+	exit(1);
 }