sites

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit 420f797006c392ae178006a99a9965f2758588dd
parent ea4dd26890207e743d12bffc364c758c06dd80df
Author: Lucas Gabriel Vuotto <lvuotto92@gmail.com>
Date:   Sat,  3 Jun 2017 18:12:05 -0300

[st][externalpipe] port to latest git

Signed-off-by: Lucas Gabriel Vuotto <lvuotto92@gmail.com>

Diffstat:
Mst.suckless.org/patches/externalpipe.md | 2+-
Dst.suckless.org/patches/st-externalpipe-20170513-5a10aca.diff | 75---------------------------------------------------------------------------
Ast.suckless.org/patches/st-externalpipe-20170603-b331da5.diff | 75+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/st.suckless.org/patches/externalpipe.md b/st.suckless.org/patches/externalpipe.md @@ -27,7 +27,7 @@ Download * [st-externalpipe-0.4.1.diff](st-externalpipe-0.4.1.diff) * [st-externalpipe-0.5.diff](st-externalpipe-0.5.diff) * [st-externalpipe-0.6.diff](st-externalpipe-0.6.diff) -* [st-externalpipe-20170513-5a10aca.diff](st-externalpipe-20170513-5a10aca.diff) +* [st-externalpipe-20170603-b331da5.diff](st-externalpipe-20170603-b331da5.diff) Authors ------- diff --git a/st.suckless.org/patches/st-externalpipe-20170513-5a10aca.diff b/st.suckless.org/patches/st-externalpipe-20170513-5a10aca.diff @@ -1,75 +0,0 @@ -diff --git a/st.c b/st.c -index ae93ade..b650940 100644 ---- a/st.c -+++ b/st.c -@@ -138,6 +138,7 @@ static void printscreen(const Arg *) ; - static void iso14755(const Arg *); - static void toggleprinter(const Arg *); - static void sendbreak(const Arg *); -+static void externalpipe(const Arg *); - - /* config.h for applying patches and the configuration. */ - #include "config.h" -@@ -2341,6 +2342,62 @@ eschandle(uchar ascii) - } - - void -+externalpipe(const Arg *arg) -+{ -+ int to[2]; /* 0 = read, 1 = write */ -+ pid_t child; -+ int n; -+ void (*oldsigpipe)(int); -+ char buf[UTF_SIZ]; -+ Glyph *bp, *end; -+ -+ if(pipe(to) == -1) -+ return; -+ -+ /* sigchld() handles this */ -+ switch(child = fork()){ -+ case -1: -+ close(to[0]), close(to[1]); -+ return; -+ case 0: -+ /* child */ -+ close(to[1]); -+ dup2(to[0], STDIN_FILENO); /* 0<&to */ -+ close(to[0]); -+ execvp( -+ "sh", -+ (char *const []){ -+ "/bin/sh", -+ "-c", -+ (char *)arg->v, -+ 0 -+ }); -+ exit(127); -+ } -+ -+ /* parent */ -+ close(to[0]); -+ /* ignore sigpipe for now, in case child exits early */ -+ oldsigpipe = signal(SIGPIPE, SIG_IGN); -+ -+ for(n = 0; n < term.row; n++){ -+ bp = &term.line[n][0]; -+ end = &bp[MIN(tlinelen(n), term.col) - 1]; -+ if(bp != end || bp->u != ' ') -+ for(; bp <= end; ++bp) -+ if(xwrite(to[1], buf, utf8encode(bp->u, buf)) < 0) -+ break; -+ if(xwrite(to[1], "\n", 1) < 0) -+ break; -+ } -+ -+ close(to[1]); -+ -+ /* restore */ -+ signal(SIGPIPE, oldsigpipe); -+} -+ -+void - tputc(Rune u) - { - char c[UTF_SIZ]; diff --git a/st.suckless.org/patches/st-externalpipe-20170603-b331da5.diff b/st.suckless.org/patches/st-externalpipe-20170603-b331da5.diff @@ -0,0 +1,75 @@ +diff --git a/st.c b/st.c +index 8d4a9f2..2cb0d45 100644 +--- a/st.c ++++ b/st.c +@@ -138,6 +138,7 @@ static void printscreen(const Arg *) ; + static void iso14755(const Arg *); + static void toggleprinter(const Arg *); + static void sendbreak(const Arg *); ++static void externalpipe(const Arg *); + + /* config.h for applying patches and the configuration. */ + #include "config.h" +@@ -2344,6 +2345,62 @@ eschandle(uchar ascii) + } + + void ++externalpipe(const Arg *arg) ++{ ++ int to[2]; /* 0 = read, 1 = write */ ++ pid_t child; ++ int n; ++ void (*oldsigpipe)(int); ++ char buf[UTF_SIZ]; ++ Glyph *bp, *end; ++ ++ if(pipe(to) == -1) ++ return; ++ ++ /* sigchld() handles this */ ++ switch(child = fork()){ ++ case -1: ++ close(to[0]), close(to[1]); ++ return; ++ case 0: ++ /* child */ ++ close(to[1]); ++ dup2(to[0], STDIN_FILENO); /* 0<&to */ ++ close(to[0]); ++ execvp( ++ "sh", ++ (char *const []){ ++ "/bin/sh", ++ "-c", ++ (char *)arg->v, ++ 0 ++ }); ++ exit(127); ++ } ++ ++ /* parent */ ++ close(to[0]); ++ /* ignore sigpipe for now, in case child exits early */ ++ oldsigpipe = signal(SIGPIPE, SIG_IGN); ++ ++ for(n = 0; n < term.row; n++){ ++ bp = &term.line[n][0]; ++ end = &bp[MIN(tlinelen(n), term.col) - 1]; ++ if(bp != end || bp->u != ' ') ++ for(; bp <= end; ++bp) ++ if(xwrite(to[1], buf, utf8encode(bp->u, buf)) < 0) ++ break; ++ if(xwrite(to[1], "\n", 1) < 0) ++ break; ++ } ++ ++ close(to[1]); ++ ++ /* restore */ ++ signal(SIGPIPE, oldsigpipe); ++} ++ ++void + tputc(Rune u) + { + char c[UTF_SIZ];