finished libsl/drw integration

[dwm.git] / util.c

diff --git a/util.c b/util.c
index 6eb19b4..51acd1a 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,37 +1,12 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam 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>
-
-/* static */
-
-static void
-bad_malloc(unsigned int size)
-{
-       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;
-}
+#include "util.h"
 
 void
-eprint(const char *errstr, ...) {
+die(const char *errstr, ...) {
        va_list ap;
 
        va_start(ap, errstr);
@@ -40,23 +15,3 @@ eprint(const char *errstr, ...) {
        exit(EXIT_FAILURE);
 }
 
-void
-spawn(Arg *arg)
-{
-       char **argv = (char **)arg->argv;
-
-       if(!argv || !argv[0])
-               return;
-       if(fork() == 0) {
-               if(fork() == 0) {
-                       if(dpy)
-                               close(ConnectionNumber(dpy));
-                       setsid();
-                       execvp(argv[0], argv);
-                       fprintf(stderr, "dwm: execvp %s", argv[0]);
-                       perror(" failed");
-               }
-               exit(0);
-       }
-       wait(0);
-}