X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=util.c;h=e29d8b0c787b7cc1ea61d432b3718a9b62edaa10;hb=8f698bd4ccea058019f9ca89ca19add300064b15;hp=3e5fd1e074c0946dee5b49c47134eec76dd2b06b;hpb=bf357945070a9f4722b8dcbf61d61b34d1aae0aa;p=dwm.git diff --git a/util.c b/util.c index 3e5fd1e..e29d8b0 100644 --- a/util.c +++ b/util.c @@ -3,7 +3,6 @@ * See LICENSE file for license details. */ #include "dwm.h" - #include #include #include @@ -15,9 +14,7 @@ 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 */ @@ -26,24 +23,28 @@ void * emallocz(unsigned int size) { void *res = calloc(1, size); + if(!res) bad_malloc(size); return res; } void -eprint(const char *errstr, ...) { +eprint(const char *errstr, ...) +{ va_list ap; + va_start(ap, errstr); vfprintf(stderr, errstr, ap); va_end(ap); - exit(1); + exit(EXIT_FAILURE); } void spawn(Arg *arg) { char **argv = (char **)arg->argv; + if(!argv || !argv[0]) return; if(fork() == 0) { @@ -55,7 +56,7 @@ spawn(Arg *arg) fprintf(stderr, "dwm: execvp %s", argv[0]); perror(" failed"); } - exit (0); + exit(0); } wait(0); }