X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=util.c;h=3175ab23d0a98a232983509fe40d64d116b2946c;hp=4cc748f0ae0fe293b9da91f20d568156c817d22c;hb=cb4aa5bc35cf16a06bb2b4e880648e390fa2cc55;hpb=e48de30516d5a0400b27a0d6bfeb1b9181e8ebf5 diff --git a/util.c b/util.c index 4cc748f..3175ab2 100644 --- a/util.c +++ b/util.c @@ -1,5 +1,4 @@ -/* - * (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVII Anselm R. Garbe * See LICENSE file for license details. */ #include "dwm.h" @@ -9,29 +8,19 @@ #include #include -/* static */ - -static void -bad_malloc(unsigned int size) -{ - eprint("fatal: could not malloc() %u bytes\n", size); -} - /* extern */ void * -emallocz(unsigned int size) -{ +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 -eprint(const char *errstr, ...) -{ +eprint(const char *errstr, ...) { va_list ap; va_start(ap, errstr); @@ -40,22 +29,31 @@ eprint(const char *errstr, ...) exit(EXIT_FAILURE); } +void * +erealloc(void *ptr, unsigned int size) { + void *res = realloc(ptr, size); + + if(!res) + eprint("fatal: could not malloc() %u bytes\n", size); + return res; +} + void -spawn(Arg *arg) -{ +spawn(Arg *arg) { static char *shell = NULL; if(!shell && !(shell = getenv("SHELL"))) shell = "/bin/sh"; - if(!arg->cmd) return; + /* The double-fork construct avoids zombie processes and keeps the code + * clean from stupid signal handlers. */ if(fork() == 0) { if(fork() == 0) { if(dpy) close(ConnectionNumber(dpy)); setsid(); - execl(shell, shell, "-c", arg->cmd, NULL); + execl(shell, shell, "-c", arg->cmd, (char *)NULL); fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg->cmd); perror(" failed"); }