sites

commit 429983bfdb92573ee706f39af9ccdae44b59fabc
parent f1144c559feb71caacac297d55282f7cbe6fde75
Author: Klemens Nanni <klemens@posteo.de>
Date:   Fri,  8 Jun 2018 19:10:26 +0200

[st] externalpipe: Add 0.8.1 patch

Diffstat:
M
st.suckless.org/patches/externalpipe/index.md
 | 
1
+
A
st.suckless.org/patches/externalpipe/st-externalpipe-0.8.1.diff
 | 
76
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

2 files changed, 77 insertions(+), 0 deletions(-)
diff --git a/st.suckless.org/patches/externalpipe/index.md b/st.suckless.org/patches/externalpipe/index.md
@@ -33,6 +33,7 @@ Download
 * [st-externalpipe-0.7.diff](st-externalpipe-0.7.diff)
 * [st-externalpipe-20170608-b331da5.diff](st-externalpipe-20170608-b331da5.diff)
 * [st-externalpipe-0.8.diff](st-externalpipe-0.8.diff)
+* [st-externalpipe-0.8.1.diff](st-externalpipe-0.8.1.diff)
 
 Authors
 -------
diff --git a/st.suckless.org/patches/externalpipe/st-externalpipe-0.8.1.diff b/st.suckless.org/patches/externalpipe/st-externalpipe-0.8.1.diff
@@ -0,0 +1,76 @@
+diff --git a/st.c b/st.c
+index 46c954b..35cd7de 100644
+--- a/st.c
++++ b/st.c
+@@ -1972,6 +1972,59 @@ tprinter(char *s, size_t len)
+ 	}
+ }
+ 
++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\n", ((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], "\n", 1) < 0)
++			break;
++		newline = 0;
++	}
++	if (newline)
++		(void)xwrite(to[1], "\n", 1);
++	close(to[1]);
++	/* restore */
++	signal(SIGPIPE, oldsigpipe);
++}
++
+ void
+ iso14755(const Arg *arg)
+ {
+diff --git a/st.h b/st.h
+index dac64d8..86cd646 100644
+--- a/st.h
++++ b/st.h
+@@ -80,6 +80,7 @@ void die(const char *, ...);
+ void redraw(void);
+ void draw(void);
+ 
++void externalpipe(const Arg *);
+ void iso14755(const Arg *);
+ void printscreen(const Arg *);
+ void printsel(const Arg *);