s/tag2/two/g

[dwm.git] / util.c

diff --git a/util.c b/util.c
index 435069f..7aff2aa 100644 (file)
--- a/util.c
+++ b/util.c
@@ -2,99 +2,60 @@
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
  * (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 <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>

-#include <string.h>
-#include <sys/types.h>

 #include <sys/wait.h>
 #include <unistd.h>
 
 #include <sys/wait.h>
 #include <unistd.h>
 

-#include "util.h"
-
-void
-error(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)
 {
 
 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);
 void *
 emallocz(unsigned int size)
 {
        void *res = calloc(1, size);

-       if(!res)
-               bad_malloc(size);
-       return res;
-}
-
-void *
-emalloc(unsigned int size)
-{
-       void *res = malloc(size);
-       if(!res)
-               bad_malloc(size);
-       return res;
-}

 
 

-void *
-erealloc(void *ptr, unsigned int size)
-{
-       void *res = realloc(ptr, size);

        if(!res)
                bad_malloc(size);
        return res;
 }
 
        if(!res)
                bad_malloc(size);
        return res;
 }
 

-char *
-estrdup(const char *str)
-{
-       void *res = strdup(str);
-       if(!res)
-               bad_malloc(strlen(str));
-       return res;
-}
-

 void
 void

-failed_assert(char *a, char *file, int line)
-{
-       fprintf(stderr, "Assertion \"%s\" failed at %s:%d\n", a, file, line);
-       abort();
-}
+eprint(const char *errstr, ...) {
+       va_list ap;

 
 

-void
-swap(void **p1, void **p2)
-{
-       void *tmp = *p1;
-       *p1 = *p2;
-       *p2 = tmp;
+       va_start(ap, errstr);
+       vfprintf(stderr, errstr, ap);
+       va_end(ap);
+       exit(EXIT_FAILURE);

 }
 
 void
 }
 
 void

-spawn(Display *dpy, const char *shell, const char *cmd)
+spawn(Arg *arg)

 {
 {

-       if(!cmd || !shell)
+       char **argv = (char **)arg->argv;
+
+       if(!argv || !argv[0])

                return;
        if(fork() == 0) {
                if(fork() == 0) {
                        if(dpy)
                                close(ConnectionNumber(dpy));
                return;
        if(fork() == 0) {
                if(fork() == 0) {
                        if(dpy)
                                close(ConnectionNumber(dpy));

-                       execl(shell, shell, "-c", cmd, (const char *)0);
-                       fprintf(stderr, "gridwm: execl %s", shell);
+                       setsid();
+                       execvp(argv[0], argv);
+                       fprintf(stderr, "dwm: execvp %s", argv[0]);

                        perror(" failed");
                }
                        perror(" failed");
                }

-               exit (0);
+               exit(0);

        }
        wait(0);
 }
        }
        wait(0);
 }