[wiki] [sites] [st][patch][externalpipe] ensure all of st's children are reaped || Rob Pilling

From: <git_AT_suckless.org>
Date: Thu, 20 Aug 2020 18:27:55 +0200

commit dc14453cf3fea8e06303507e64d34856ade068fd
Author: Rob Pilling <robpilling_AT_gmail.com>
Date: Thu Aug 20 18:23:56 2020 +0100

    [st][patch][externalpipe] ensure all of st's children are reaped

diff --git a/st.suckless.org/patches/externalpipe/index.md b/st.suckless.org/patches/externalpipe/index.md
index f2747358..c1c62cb1 100644
--- a/st.suckless.org/patches/externalpipe/index.md
+++ b/st.suckless.org/patches/externalpipe/index.md
_AT_@ -38,6 +38,7 @@ Download
 * [st-externalpipe-0.8.1.diff](st-externalpipe-0.8.1.diff)
 * [st-externalpipe-20181016-3be4cf1.diff](st-externalpipe-20181016-3be4cf1.diff)
 * [st-externalpipe-0.8.2.diff](st-externalpipe-0.8.2.diff)
+* [st-externalpipe-0.8.4.diff](st-externalpipe-0.8.4.diff)
 
 When using the scrollback patch, you can apply this patch ontop in order to use
 externalpipe onto the entire terminal history:
_AT_@ -46,6 +47,6 @@ externalpipe onto the entire terminal history:
 
 Authors
 -------
-* Rob Pilling - <robpilling_AT_gmail.com>
+* Rob Pilling - <robpilling_AT_gmail.com> (original, 0.8, git ports)
 * Laslo Hunhold - <dev_AT_frign.de> (0.4.1, 0.5, 0.6, git ports)
 * Lucas Gabriel Vuotto - <lvuotto92_AT_gmail.com> (0.7, git ports)
diff --git a/st.suckless.org/patches/externalpipe/st-externalpipe-0.8.4.diff b/st.suckless.org/patches/externalpipe/st-externalpipe-0.8.4.diff
new file mode 100644
index 00000000..297d7464
--- /dev/null
+++ b/st.suckless.org/patches/externalpipe/st-externalpipe-0.8.4.diff
_AT_@ -0,0 +1,92 @@
+diff --git a/st.c b/st.c
+index 76b7e0d..0e9a614 100644
+--- a/st.c
++++ b/st.c
+_AT_@ -723,8 +723,14 @@ sigchld(int a)
+ if ((p = waitpid(pid, &stat, WNOHANG)) < 0)
+ die("waiting for pid %hd failed: %s
", pid, strerror(errno));
+
+- if (pid != p)
++ if (pid != p) {
++ if (p == 0 && wait(&stat) < 0)
++ die("wait: %s
", strerror(errno));
++
++ /* reinstall sigchld handler */
++ signal(SIGCHLD, sigchld);
+ return;
++ }
+
+ if (WIFEXITED(stat) && WEXITSTATUS(stat))
+ die("child exited with status %d
", WEXITSTATUS(stat));
+_AT_@ -1926,6 +1932,59 @@ strparse(void)
+ }
+ }
+
++void
++externalpipe(const Arg *arg)
++{
++ int to[2];
++ char buf[UTF_SIZ];
++ void (*oldsigpipe)(int);
++ Glyph *bp, *end;
++ int lastpos, n, newline;
++
++ if (pipe(to) == -1)
++ return;
++
++ switch (fork()) {
++ case -1:
++ close(to[0]);
++ close(to[1]);
++ return;
++ case 0:
++ dup2(to[0], STDIN_FILENO);
++ close(to[0]);
++ close(to[1]);
++ execvp(((char **)arg->v)[0], (char **)arg->v);
++ fprintf(stderr, "st: execvp %s
", ((char **)arg->v)[0]);
++ perror("failed");
++ exit(0);
++ }
++
++ close(to[0]);
++ /* ignore sigpipe for now, in case child exists early */
++ oldsigpipe = signal(SIGPIPE, SIG_IGN);
++ newline = 0;
++ for (n = 0; n < term.row; n++) {
++ bp = term.line[n];
++ lastpos = MIN(tlinelen(n) + 1, term.col) - 1;
++ if (lastpos < 0)
++ break;
++ end = &bp[lastpos + 1];
++ for (; bp < end; ++bp)
++ if (xwrite(to[1], buf, utf8encode(bp->u, buf)) < 0)
++ break;
++ if ((newline = term.line[n][lastpos].mode & ATTR_WRAP))
++ continue;
++ if (xwrite(to[1], "
", 1) < 0)
++ break;
++ newline = 0;
++ }
++ if (newline)
++ (void)xwrite(to[1], "
", 1);
++ close(to[1]);
++ /* restore */
++ signal(SIGPIPE, oldsigpipe);
++}
++
+ void
+ strdump(void)
+ {
+diff --git a/st.h b/st.h
+index 3d351b6..392b64e 100644
+--- a/st.h
++++ b/st.h
+_AT_@ -81,6 +81,7 @@ void die(const char *, ...);
+ void redraw(void);
+ void draw(void);
+
++void externalpipe(const Arg *);
+ void printscreen(const Arg *);
+ void printsel(const Arg *);
+ void sendbreak(const Arg *);
Received on Thu Aug 20 2020 - 18:27:55 CEST