summaryrefslogtreecommitdiff
path: root/util.c
diff options
context:
space:
mode:
authorAnselm R. Garbe <garbeam@wmii.de>2006-07-11 18:15:11 +0200
committerAnselm R. Garbe <garbeam@wmii.de>2006-07-11 18:15:11 +0200
commit586f66331d1105be03c42e6faeae1672b974a98a (patch)
treeb5a4f654969baf431ac0f10dad2354d70e7efc2b /util.c
parent33996500763b04119a6867dfa4040a4236c21a41 (diff)
added bar event timer
Diffstat (limited to 'util.c')
-rw-r--r--util.c25
1 files changed, 8 insertions, 17 deletions
diff --git a/util.c b/util.c
index 052d535..2cc2d4d 100644
--- a/util.c
+++ b/util.c
@@ -14,8 +14,6 @@
#include "util.h"
-static char *shell = NULL;
-
void
error(char *errstr, ...) {
va_list ap;
@@ -85,21 +83,17 @@ swap(void **p1, void **p2)
}
void
-spawn(Display *dpy, const char *cmd)
+spawn(Display *dpy, char *argv[])
{
- if(!shell && !(shell = getenv("SHELL")))
- shell = "/bin/sh";
-
- if(!cmd)
+ if(!argv || !argv[0])
return;
if(fork() == 0) {
if(fork() == 0) {
if(dpy)
close(ConnectionNumber(dpy));
setsid();
- fprintf(stderr, "gridwm: execlp %s %s -c %s", shell, shell, cmd);
- execlp(shell, shell, "-c", cmd, NULL);
- fprintf(stderr, "gridwm: execlp %s", cmd);
+ execvp(argv[0], argv);
+ fprintf(stderr, "gridwm: execvp %s", argv[0]);
perror(" failed");
}
exit (0);
@@ -108,15 +102,12 @@ spawn(Display *dpy, const char *cmd)
}
void
-pipe_spawn(char *buf, unsigned int len, Display *dpy, const char *cmd)
+pipe_spawn(char *buf, unsigned int len, Display *dpy, char *argv[])
{
unsigned int l, n;
int pfd[2];
- if(!shell && !(shell = getenv("SHELL")))
- shell = "/bin/sh";
-
- if(!cmd)
+ if(!argv || !argv[0])
return;
if(pipe(pfd) == -1) {
@@ -131,8 +122,8 @@ pipe_spawn(char *buf, unsigned int len, Display *dpy, const char *cmd)
dup2(pfd[1], STDOUT_FILENO);
close(pfd[0]);
close(pfd[1]);
- execlp(shell, shell, "-c", cmd, NULL);
- fprintf(stderr, "gridwm: execlp %s", cmd);
+ execvp(argv[0], argv);
+ fprintf(stderr, "gridwm: execvp %s", argv[0]);
perror(" failed");
}
else {