fixed several stuff (gridwm gets better and better)

[dwm.git] / util.c

diff --git a/util.c b/util.c
index 99842e9..c0f2489 100644 (file)
--- a/util.c
+++ b/util.c
@@ -7,6 +7,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include "util.h"
+
+static char *shell = NULL;
 
 void
 error(char *errstr, ...) {
@@ -75,3 +82,68 @@ swap(void **p1, void **p2)
        *p1 = *p2;
        *p2 = tmp;
 }
+
+void
+spawn(Display *dpy, const char *cmd)
+{
+       if(!shell && !(shell = getenv("SHELL")))
+               shell = "/bin/sh";
+
+       if(!cmd)
+               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);
+                       perror(" failed");
+               }
+               exit (0);
+       }
+       wait(0);
+}
+
+void
+pipe_spawn(char *buf, unsigned int len, Display *dpy, const char *cmd)
+{
+       unsigned int l, n;
+       int pfd[2];
+
+       if(!shell && !(shell = getenv("SHELL")))
+               shell = "/bin/sh";
+
+       if(!cmd)
+               return;
+
+       if(pipe(pfd) == -1) {
+               perror("pipe");
+               exit(1);
+       }
+
+       if(fork() == 0) {
+               if(dpy)
+                       close(ConnectionNumber(dpy));
+               setsid();
+               dup2(pfd[1], STDOUT_FILENO);
+               close(pfd[0]);
+               close(pfd[1]);
+               execlp(shell, shell, "-c", cmd, NULL);
+               fprintf(stderr, "gridwm: execlp %s", cmd);
+               perror(" failed");
+       }
+       else {
+               n = 0;
+               close(pfd[1]);
+               while(l > n) {
+                       if((l = read(pfd[0], buf + n, len - n)) < 1)
+                               break;
+                       n += l;
+               }
+               close(pfd[0]);
+               buf[n - 1] = 0;
+       }
+       wait(0);
+}