pinosaur
/
st.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix sigchld
[st.git]
/
st.c
diff --git
a/st.c
b/st.c
index
6c167b5
..
300cab6
100644
(file)
--- a/
st.c
+++ b/
st.c
@@
-860,7
+860,6
@@
mousereport(XEvent *e) {
+ ((state & ControlMask) ? 16 : 0);
}
+ ((state & ControlMask) ? 16 : 0);
}
- len = 0;
if(IS_SET(MODE_MOUSESGR)) {
len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
button, x+1, y+1,
if(IS_SET(MODE_MOUSESGR)) {
len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
button, x+1, y+1,
@@
-1239,10
+1238,14
@@
execsh(void) {
void
sigchld(int a) {
int stat, ret;
void
sigchld(int a) {
int stat, ret;
+ pid_t p;
- if(
waitpid(pid, &stat, 0
) < 0)
+ if(
(p = waitpid(pid, &stat, WNOHANG)
) < 0)
die("Waiting for pid %hd failed: %s\n", pid, strerror(errno));
die("Waiting for pid %hd failed: %s\n", pid, strerror(errno));
+ if(pid != p)
+ return;
+
ret = WIFEXITED(stat) ? WEXITSTATUS(stat) : EXIT_FAILURE;
if (ret != EXIT_SUCCESS)
die("child finished with error '%d'\n", stat);
ret = WIFEXITED(stat) ? WEXITSTATUS(stat) : EXIT_FAILURE;
if (ret != EXIT_SUCCESS)
die("child finished with error '%d'\n", stat);