Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
patched resizemouse according to sanders remark
[dwm.git]
/
util.c
diff --git
a/util.c
b/util.c
index
2414b39
..
c31d7f9
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-9,29
+9,19
@@
#include <sys/wait.h>
#include <unistd.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 *
/* extern */
void *
-emallocz(unsigned int size)
-{
+emallocz(unsigned int size) {
void *res = calloc(1, size);
if(!res)
void *res = calloc(1, size);
if(!res)
-
bad_malloc(
size);
+
eprint("fatal: could not malloc() %u bytes\n",
size);
return res;
}
void
return res;
}
void
-eprint(const char *errstr, ...)
-{
+eprint(const char *errstr, ...) {
va_list ap;
va_start(ap, errstr);
va_list ap;
va_start(ap, errstr);
@@
-41,17
+31,15
@@
eprint(const char *errstr, ...)
}
void *
}
void *
-erealloc(void *ptr, unsigned int size)
-{
+erealloc(void *ptr, unsigned int size) {
void *res = realloc(ptr, size);
if(!res)
void *res = realloc(ptr, size);
if(!res)
-
bad_malloc(
size);
+
eprint("fatal: could not malloc() %u bytes\n",
size);
return res;
}
void
return res;
}
void
-spawn(Arg *arg)
-{
+spawn(Arg *arg) {
static char *shell = NULL;
if(!shell && !(shell = getenv("SHELL")))
static char *shell = NULL;
if(!shell && !(shell = getenv("SHELL")))
@@
-59,12
+47,14
@@
spawn(Arg *arg)
if(!arg->cmd)
return;
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();
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");
}
fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg->cmd);
perror(" failed");
}