Pledge on OpenBSD

[dwm.git] / util.c

diff --git a/util.c b/util.c
index e95dfc5..fe044fc 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,67 +1,35 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
+/* See LICENSE file for copyright and license details. */

 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>

-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-#include "dwm.h"
+#include <string.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);
-}
+#include "util.h"

 
 void *
 
 void *

-emallocz(unsigned int size)
+ecalloc(size_t nmemb, size_t size)

 {
 {

-       void *res = calloc(1, size);
-       if(!res)
-               bad_malloc(size);
-       return res;
-}
+       void *p;

 
 

-void
-swap(void **p1, void **p2)
-{
-       void *tmp = *p1;
-       *p1 = *p2;
-       *p2 = tmp;
+       if (!(p = calloc(nmemb, size)))
+               die("calloc:");
+       return p;

 }
 
 void
 }
 
 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);
+die(const char *fmt, ...) {
+       va_list ap;
+
+       va_start(ap, fmt);
+       vfprintf(stderr, fmt, ap);
+       va_end(ap);
+
+       if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
+               fputc(' ', stderr);
+               perror(NULL);
+       } else {
+               fputc('\n', stderr);

        }
        }

-       wait(0);
+
+       exit(1);

 }
 }