h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-13 21:11:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Continued adoption of autoclose_fd_t and exec_close

Browse Source
This commit is contained in:
ridiculousfish
2020-01-29 14:01:55 -08:00
parent 3d47f042ac
commit 28a8d0dbf7
4 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/reader.cpp
View File

@@ -1663,18 +1663,16 @@ static bool check_for_orphaned_process(unsigned long loop_count, pid_t shell_pgi
}
// Open the tty. Presumably this is stdin, but maybe not?
int tty_fd = open(tty, O_RDONLY | O_NONBLOCK);
if (tty_fd < 0) {
autoclose_fd_t tty_fd{open(tty, O_RDONLY | O_NONBLOCK)};
if (!tty_fd.valid()) {
wperror(L"open");
exit_without_destructors(1);
}
char tmp;
if (read(tty_fd, &tmp, 1) < 0 && errno == EIO) {
if (read(tty_fd.fd(), &tmp, 1) < 0 && errno == EIO) {
we_think_we_are_orphaned = true;
}
close(tty_fd);
}
// Just give up if we've done it a lot times.