X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=util.c;h=990ad28c0cc28c728e219347dc5a227d170ad3ce;hb=a207949b6503546379e3ab727cecc2f3e0cff78d;hp=f7e3e6fe5fae37a933a93f0b930b508b41515e22;hpb=adaa28a6e600f636f5e86244ccef69e98419ba1a;p=dwm.git

diff --git a/util.c b/util.c
index f7e3e6f..990ad28 100644
--- a/util.c
+++ b/util.c
@@ -3,59 +3,63 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
-/* static functions */
+/* 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 functions */
+/* extern */
 
 void *
 emallocz(unsigned int size)
 {
 	void *res = calloc(1, size);
+
 	if(!res)
 		bad_malloc(size);
 	return res;
 }
 
 void
-eprint(const char *errstr, ...) {
+eprint(const char *errstr, ...)
+{
 	va_list ap;
+
 	va_start(ap, errstr);
 	vfprintf(stderr, errstr, ap);
 	va_end(ap);
-	exit(1);
+	exit(EXIT_FAILURE);
 }
 
 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'", arg->cmd);
 			perror(" failed");
 		}
-		exit (0);
+		exit(0);
 	}
 	wait(0);
 }