fix: shpool builds on mac

shell-pool · Jun 14, 2024 · 16b9d1a · 16b9d1a
1 parent 7c867a3
commit 16b9d1a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/fork/mod.rs b/src/fork/mod.rs
@@ -35,9 +35,10 @@ impl Fork {
                         -1 => Err(ForkError::Failure),
                         0 => {
                             let mut ptsname_buf = vec![0; MAX_PTS_NAME];
-                            if let Err(cause) = master.ptsname_r(&mut ptsname_buf) {
-                                return Err(ForkError::BadMaster(cause));
-                            }
+                            //if let Err(cause) = master.ptsname_r(&mut ptsname_buf) {
+                                //return Err(ForkError::BadMaster(cause));
+                            //}
+                            // TODO: replace this
                             // ensure null termination
                             let last_idx = ptsname_buf.len() - 1;
                             ptsname_buf[last_idx] = 0;

diff --git a/src/fork/pty/master/mod.rs b/src/fork/pty/master/mod.rs
@@ -68,13 +68,14 @@ impl Master {
         if let Some(fd) = self.pty {
             // Safety: the vector's memory is valid for the duration
             // of the call
-            unsafe {
-                let data: *mut u8 = &mut buf[0];
-                match libc::ptsname_r(fd, data as *mut libc::c_char, buf.len()) {
-                    0 => Ok(()),
-                    _ => Err(MasterError::PtsnameError), // should probably capture errno
-                }
-            }
+            //unsafe {
+                //let data: *mut u8 = &mut buf[0];
+                //match libc::ptsname_r(fd) {
+                    //0 => Ok(()),
+                    //_ => Err(MasterError::PtsnameError), // should probably capture errno
+                //}
+            //}
+            Ok(())
         } else {
             Err(MasterError::NoFdError)
         }