SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ptyfwd: try to drain on exit only once

Browse Source 
Reading or writing a fd may fail with EBUSY, and the loop might run
without doing mostly nothing and the event loop may finish with ELOOP.
This commit is contained in:
Yu Watanabe
2024-12-25 17:51:42 +09:00
parent 7647378b74
commit d3218c4c80
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/ptyfwd.c
+3 -12
View File
@@ -849,14 +849,8 @@ static int on_exit_event(sd_event_source *e, void *userdata) {
assert(e);
assert(e == f->exit_event_source);
/* Drain the buffer on exit. */
if (f->done)
return 0;
for (unsigned trial = 0; trial < 1000; trial++) {
if (drained(f))
return pty_forward_done(f, 0);
if (!pty_forward_drain(f)) {
/* If not drained, try to drain the buffer. */
if (!f->master_hangup)
f->master_writable = f->master_readable = true;
@@ -868,12 +862,9 @@ static int on_exit_event(sd_event_source *e, void *userdata) {
r = shovel(f);
if (r < 0)
return r;
if (f->done)
return 0;
}
/* If we could not drain, then propagate recognizable error code. */
return pty_forward_done(f, -ELOOP);
return pty_forward_done(f, 0);
}
int pty_forward_new(