X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/e1deda9e040c052af62aecc2fb4ee770fb2496a2..56a31dc4a7be459e3a1ea06d45427e1a4087a1a6:/util.c

diff --git a/util.c b/util.c
index effd9da..6b703e9 100644
--- a/util.c
+++ b/util.c
@@ -1,55 +1,33 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * © 2007 Premysl Hruby <dfenze 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>
 
-/* extern */
+#include "util.h"
 
 void *
-emallocz(unsigned int size) {
-	void *res = calloc(1, 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)))
+		perror(NULL);
+	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
-spawn(const char *arg) {
-	static char *shell = NULL;
 
-	if(!shell && !(shell = getenv("SHELL")))
-		shell = "/bin/sh";
-	if(!arg)
-		return;
-	/* The double-fork construct avoids zombie processes and keeps the code
-	 * clean from stupid signal handlers. */
-	if(fork() == 0) {
-		if(fork() == 0) {
-			if(dpy)
-				close(ConnectionNumber(dpy));
-			setsid();
-			execl(shell, shell, "-c", arg, (char *)NULL);
-			fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg);
-			perror(" failed");
-		}
-		exit(0);
+	if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
+		fputc(' ', stderr);
+		perror(NULL);
 	}
-	wait(0);
+
+	exit(1);
 }