From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 22 Sep 2020 12:18:11 +0000 (+0200)
Subject: ptyfwd: use ERRNO_IS_DISCONNECT() when checking for disconnection on foreign fds
X-Git-Tag: v247-rc1~192^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F17127%2Fhead;p=thirdparty%2Fsystemd.git

ptyfwd: use ERRNO_IS_DISCONNECT() when checking for disconnection on foreign fds
---

diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c
index 6d67c079e4b..bb372d40010 100644
--- a/src/shared/ptyfwd.c
+++ b/src/shared/ptyfwd.c
@@ -16,6 +16,7 @@
 #include "sd-event.h"
 
 #include "alloc-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "log.h"
 #include "macro.h"
@@ -195,7 +196,7 @@ static int shovel(PTYForward *f) {
 
                                 if (errno == EAGAIN)
                                         f->stdin_readable = false;
-                                else if (IN_SET(errno, EIO, EPIPE, ECONNRESET)) {
+                                else if (errno == EIO || ERRNO_IS_DISCONNECT(errno)) {
                                         f->stdin_readable = false;
                                         f->stdin_hangup = true;
 
@@ -279,7 +280,7 @@ static int shovel(PTYForward *f) {
 
                                 if (errno == EAGAIN)
                                         f->stdout_writable = false;
-                                else if (IN_SET(errno, EIO, EPIPE, ECONNRESET)) {
+                                else if (errno == EIO || ERRNO_IS_DISCONNECT(errno)) {
                                         f->stdout_writable = false;
                                         f->stdout_hangup = true;
                                         f->stdout_event_source = sd_event_source_unref(f->stdout_event_source);