removed badmalloc (thx for the pointer to Uriel)

[dwm.git] / util.c

diff --git a/util.c b/util.c
index d8e6612..2eb9eb2 100644 (file)
--- a/util.c
+++ b/util.c
@@ -2,50 +2,34 @@
  * (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 "dwm.h"
-
-void
-error(const char *errstr, ...) {
-       va_list ap;
-       va_start(ap, errstr);
-       vfprintf(stderr, errstr, ap);
-       va_end(ap);
-       exit(1);
-}
-
-static void
-bad_malloc(unsigned int size)
-{
-       fprintf(stderr, "fatal: could not malloc() %d bytes\n",
-                       (int) size);
-       exit(1);
-}
+/* extern */
 
 void *
 emallocz(unsigned int size)
 {
        void *res = calloc(1, size);
+
        if(!res)
-               bad_malloc(size);
+               eprint("fatal: could not malloc() %u bytes\n", size);
        return res;
 }
 
-void *
-emalloc(unsigned int size)
+void
+eprint(const char *errstr, ...)
 {
-       void *res = malloc(size);
-       if(!res)
-               bad_malloc(size);
-       return res;
+       va_list ap;
+
+       va_start(ap, errstr);
+       vfprintf(stderr, errstr, ap);
+       va_end(ap);
+       exit(EXIT_FAILURE);
 }
 
 void *
@@ -53,43 +37,30 @@ erealloc(void *ptr, unsigned int size)
 {
        void *res = realloc(ptr, size);
        if(!res)
-               bad_malloc(size);
+               eprint("fatal: could not malloc() %u bytes\n", size);
        return res;
 }
 
-char *
-estrdup(const char *str)
-{
-       char *res = strdup(str);
-       if(!res)
-               bad_malloc(strlen(str));
-       return res;
-}
-
-void
-swap(void **p1, void **p2)
-{
-       void *tmp = *p1;
-       *p1 = *p2;
-       *p2 = tmp;
-}
-
 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);
 }