Merge pull request #20 from emilio/interrupt

Handle EINTR.
rust-lang · Jan 13, 2020 · 655977e · 655977e
2 parents b7d8bc9 + b6c1e95
commit 655977e
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -591,7 +591,11 @@ mod imp {
  loop {
  fd.revents = 0;
  if libc::poll(&mut fd, 1, -1) == -1 {
- return Err(io::Error::last_os_error());
+ let e = io::Error::last_os_error();
+ match e.kind() {
+ io::ErrorKind::Interrupted => continue,
+ _ => return Err(e),
+ }
  }
  if fd.revents == 0 {
  continue;
@@ -605,8 +609,10 @@ mod imp {
  "early EOF on jobserver pipe",
  ))
  }
- Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {}
- Err(e) => return Err(e),
+ Err(e) => match e.kind() {
+ io::ErrorKind::WouldBlock | io::ErrorKind::Interrupted => continue,
+ _ => return Err(e),
+ },
  }
  }
  }