From 790539f962c417fa4b2f5f55a6be2440c96ca43e Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Wed, 9 Oct 2024 11:51:05 -0600
Subject: [PATCH] Fix compilation with latest redox-scheme

---
 src/main.rs   | 4 ++--
 src/scheme.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 1255a473ff..e35c884a91 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -113,7 +113,7 @@ fn scan_requests(
                 }
             }
             RequestKind::Call(request) => {
-                if let Ok(response) = request.handle_scheme_block_mut(scheme) {
+                if let Some(response) = request.handle_scheme_block_mut(scheme) {
                     let _ = socket
                         .write_response(response, SignalBehavior::Restart)
                         .expect("pty: failed to write responses to pty scheme");
@@ -130,7 +130,7 @@ fn scan_requests(
 fn do_todos(socket: &Socket, scheme: &mut PtyScheme, todo: &mut Vec<Todo>) {
     let mut i = 0;
     while i < todo.len() {
-        if let Ok(response) = todo[i].request.handle_scheme_block_mut(scheme) {
+        if let Some(response) = todo[i].request.handle_scheme_block_mut(scheme) {
             todo.remove(i);
             socket
                 .write_response(response, SignalBehavior::Restart)
diff --git a/src/scheme.rs b/src/scheme.rs
index 1ad609d599..64c4f23a60 100644
--- a/src/scheme.rs
+++ b/src/scheme.rs
@@ -84,12 +84,12 @@ impl SchemeBlockMut for PtyScheme {
         Ok(Some(id))
     }
 
-    fn read(&mut self, id: usize, buf: &mut [u8]) -> Result<Option<usize>> {
+    fn read(&mut self, id: usize, buf: &mut [u8], _offset: u64, _fcntl_flags: u32) -> Result<Option<usize>> {
         let handle = self.handles.get_mut(&id).ok_or(Error::new(EBADF))?;
         handle.read(buf)
     }
 
-    fn write(&mut self, id: usize, buf: &[u8]) -> Result<Option<usize>> {
+    fn write(&mut self, id: usize, buf: &[u8], _offset: u64, _fcntl_flags: u32) -> Result<Option<usize>> {
         let handle = self.handles.get_mut(&id).ok_or(Error::new(EBADF))?;
         handle.write(buf)
     }