chiark / gitweb /
core: monitor the inotify file descriptor not the console one in acquire_terminal()
authorFranck Bui <fbui@suse.com>
Wed, 2 Nov 2016 15:24:57 +0000 (16:24 +0100)
committerSven Eden <yamakuzure@gmx.net>
Mon, 17 Jul 2017 15:58:34 +0000 (17:58 +0200)
When waiting for the terminal to be release in acquire_terminal(), we
were monitoring the terminal fd instead of the inotify descriptor.

Therefore any write accesses would wake up the waiting process instead
of being wake up when the tty is closed only.

src/basic/terminal-util.c

index d29dcd5..98600f7 100644 (file)
@@ -457,7 +457,7 @@ int acquire_terminal(
                                         goto fail;
                                 }
 
-                                r = fd_wait_for_event(fd, POLLIN, ts + timeout - n);
+                                r = fd_wait_for_event(notify, POLLIN, ts + timeout - n);
                                 if (r < 0)
                                         goto fail;