X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=util.c;h=2414b394fc7a2fe81b5b3043ea1c937be7cb9e2d;hp=e95dfc5f946c623774a30e41105af613d8f36b36;hb=b43989207a949cbc17182b451aa527afe542c98f;hpb=a1d0f819661f2be48f7a03ddd001f2a1a8f325e4

diff --git a/util.c b/util.c
index e95dfc5..2414b39 100644
--- a/util.c
+++ b/util.c
@@ -2,66 +2,73 @@
  * (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 <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "dwm.h"
-
-void
-error(const 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);
+	eprint("fatal: could not malloc() %u bytes\n", size);
 }
 
+/* extern */
+
 void *
 emallocz(unsigned int size)
 {
 	void *res = calloc(1, size);
+
 	if(!res)
 		bad_malloc(size);
 	return res;
 }
 
 void
-swap(void **p1, void **p2)
+eprint(const char *errstr, ...)
+{
+	va_list ap;
+
+	va_start(ap, errstr);
+	vfprintf(stderr, errstr, ap);
+	va_end(ap);
+	exit(EXIT_FAILURE);
+}
+
+void *
+erealloc(void *ptr, unsigned int size)
 {
-	void *tmp = *p1;
-	*p1 = *p2;
-	*p2 = tmp;
+	void *res = realloc(ptr, size);
+	if(!res)
+		bad_malloc(size);
+	return res;
 }
 
 void
 spawn(Arg *arg)
 {
-	char **argv = (char **)arg->argv;
-	if(!argv || !argv[0])
+	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();
-			execvp(argv[0], argv);
-			fprintf(stderr, "dwm: execvp %s", argv[0]);
+			execl(shell, shell, "-c", arg->cmd, NULL);
+			fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg->cmd);
 			perror(" failed");
 		}
-		exit (0);
+		exit(0);
 	}
 	wait(0);
 }