X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=util.c;h=1e36b2575e902dc36a4ae908df6afac6e15bd4d9;hp=435069f9903703412fe2edfc3514058d01014959;hb=1f9614f82e14fa3a46e0db05346b41d6be611f88;hpb=439e15d09f6fa9271d3b49ef97194f0c80ebe161

diff --git a/util.c b/util.c
index 435069f..1e36b25 100644
--- a/util.c
+++ b/util.c
@@ -2,34 +2,26 @@
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
+#include "dwm.h"
 
 #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 */
 
 static void
 bad_malloc(unsigned int size)
 {
 	fprintf(stderr, "fatal: could not malloc() %d bytes\n",
 			(int) size);
-	exit(1);
+	exit(EXIT_FAILURE);
 }
 
+/* extern */
+
 void *
 emallocz(unsigned int size)
 {
@@ -39,62 +31,31 @@ emallocz(unsigned int 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)
-{
-	void *res = realloc(ptr, size);
-	if(!res)
-		bad_malloc(size);
-	return res;
-}
-
-char *
-estrdup(const char *str)
-{
-	void *res = strdup(str);
-	if(!res)
-		bad_malloc(strlen(str));
-	return res;
-}
-
 void
-failed_assert(char *a, char *file, int line)
-{
-	fprintf(stderr, "Assertion \"%s\" failed at %s:%d\n", a, file, line);
-	abort();
-}
-
-void
-swap(void **p1, void **p2)
-{
-	void *tmp = *p1;
-	*p1 = *p2;
-	*p2 = tmp;
+eprint(const char *errstr, ...) {
+	va_list ap;
+	va_start(ap, errstr);
+	vfprintf(stderr, errstr, ap);
+	va_end(ap);
+	exit(EXIT_FAILURE);
 }
 
 void
-spawn(Display *dpy, const char *shell, const char *cmd)
+spawn(Arg *arg)
 {
-	if(!cmd || !shell)
+	char **argv = (char **)arg->argv;
+	if(!argv || !argv[0])
 		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);
+			setsid();
+			execvp(argv[0], argv);
+			fprintf(stderr, "dwm: execvp %s", argv[0]);
 			perror(" failed");
 		}
-		exit (0);
+		exit(EXIT_FAILURE);
 	}
 	wait(0);
 }