pinosaur
/
dwm.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed unnecessary crap
[dwm.git]
/
util.c
diff --git
a/util.c
b/util.c
index
435069f
..
1d37906
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-11,7
+11,7
@@
#include <sys/wait.h>
#include <unistd.h>
#include <sys/wait.h>
#include <unistd.h>
-#include "
util
.h"
+#include "
wm
.h"
void
error(char *errstr, ...) {
void
error(char *errstr, ...) {
@@
-60,19
+60,12
@@
erealloc(void *ptr, unsigned int size)
char *
estrdup(const char *str)
{
char *
estrdup(const char *str)
{
-
void
*res = strdup(str);
+
char
*res = strdup(str);
if(!res)
bad_malloc(strlen(str));
return res;
}
if(!res)
bad_malloc(strlen(str));
return res;
}
-void
-failed_assert(char *a, char *file, int line)
-{
- fprintf(stderr, "Assertion \"%s\" failed at %s:%d\n", a, file, line);
- abort();
-}
-
void
swap(void **p1, void **p2)
{
void
swap(void **p1, void **p2)
{
@@
-82,16
+75,17
@@
swap(void **p1, void **p2)
}
void
}
void
-spawn(Display *dpy, c
onst char *shell, const char *cmd
)
+spawn(Display *dpy, c
har *argv[]
)
{
{
- if(!
cmd || !shell
)
+ 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, "gridwm: execvp %s", argv[0]);
perror(" failed");
}
exit (0);
perror(" failed");
}
exit (0);