aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2019-06-28 17:02:26 +0100
committerThomas Adam <thomas@xteddy.org>2019-06-28 17:02:26 +0100
commit68c2fc682493f154d833ae6195b4adc33fd4a3b2 (patch)
tree48e607a5287d05b834b81eefc047ae80c3f04bf4
parentb6b4f86cfc34f9386819af8f04add72833ccc69a (diff)
parent4ff7bc3eb32e9d66312d16757fb8c083df2d87d6 (diff)
downloadrtmux-68c2fc682493f154d833ae6195b4adc33fd4a3b2.tar.gz
rtmux-68c2fc682493f154d833ae6195b4adc33fd4a3b2.tar.bz2
rtmux-68c2fc682493f154d833ae6195b4adc33fd4a3b2.zip
Merge branch 'obsd-master'
-rw-r--r--client.c2
-rw-r--r--job.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/client.c b/client.c
index d137501a..d570849b 100644
--- a/client.c
+++ b/client.c
@@ -436,7 +436,7 @@ client_stdin_callback(__unused int fd, __unused short events,
struct msg_stdin_data data;
data.size = read(STDIN_FILENO, data.data, sizeof data.data);
- if (data.size < 0 && (errno == EINTR || errno == EAGAIN))
+ if (data.size == -1 && (errno == EINTR || errno == EAGAIN))
return;
proc_send(client_peer, MSG_STDIN, -1, &data, sizeof data);
diff --git a/job.c b/job.c
index dac38ed9..10883e8e 100644
--- a/job.c
+++ b/job.c
@@ -117,7 +117,7 @@ job_run(const char *cmd, struct session *s, const char *cwd,
close(out[0]);
nullfd = open(_PATH_DEVNULL, O_RDWR, 0);
- if (nullfd < 0)
+ if (nullfd == -1)
fatal("open failed");
if (dup2(nullfd, STDERR_FILENO) == -1)
fatal("dup2 failed");