libc first

Author: youknowone

crates/common/src/fileutils.rs

@@ -460,22 +460,16 @@ pub fn fopen(path: &std::path::Path, mode: &str) -> std::io::Result<*mut libc::F
     {
         use std::os::windows::io::IntoRawHandle;
 
-        // Declare Windows CRT functions
-        unsafe extern "C" {
-            fn _open_osfhandle(handle: isize, flags: libc::c_int) -> libc::c_int;
-            fn _fdopen(fd: libc::c_int, mode: *const libc::c_char) -> *mut libc::FILE;
-        }
-
         // Convert File handle to CRT file descriptor
         let handle = file.into_raw_handle();
-        let fd = unsafe { _open_osfhandle(handle as isize, libc::O_RDONLY) };
+        let fd = unsafe { libc::open_osfhandle(handle as isize, libc::O_RDONLY) };
         if fd == -1 {
             return Err(std::io::Error::last_os_error());
         }
 
         // Convert fd to FILE*
         let mode_cstr = CString::new(mode).unwrap();
-        let fp = unsafe { _fdopen(fd, mode_cstr.as_ptr()) };
+        let fp = unsafe { libc::fdopen(fd, mode_cstr.as_ptr()) };
         if fp.is_null() {
             unsafe { libc::close(fd) };
             return Err(std::io::Error::last_os_error());

crates/vm/src/stdlib/msvcrt.rs

@@ -88,13 +88,9 @@ mod msvcrt {
         }
     }
 
-    unsafe extern "C" {
-        fn _open_osfhandle(osfhandle: isize, flags: i32) -> i32;
-    }
-
     #[pyfunction]
     fn open_osfhandle(handle: isize, flags: i32, vm: &VirtualMachine) -> PyResult<i32> {
-        let ret = unsafe { suppress_iph!(_open_osfhandle(handle, flags)) };
+        let ret = unsafe { suppress_iph!(libc::open_osfhandle(handle, flags)) };
         if ret == -1 {
             Err(errno_err(vm))
         } else {

crates/vm/src/stdlib/nt.rs

@@ -833,9 +833,6 @@ pub(crate) mod module {
 
     unsafe extern "C" {
         fn _umask(mask: i32) -> i32;
-        fn _dup(fd: i32) -> i32;
-        fn _dup2(fd: i32, fd2: i32) -> i32;
-        fn _open_osfhandle(osfhandle: intptr_t, flags: i32) -> i32;
     }
 
     /// Close fd and convert error to PyException (PEP 446 cleanup)
@@ -877,8 +874,8 @@ pub(crate) mod module {
         // Convert handles to file descriptors
         // O_NOINHERIT = 0x80 (MSVC CRT)
         const O_NOINHERIT: i32 = 0x80;
-        let read_fd = unsafe { _open_osfhandle(read_handle, O_NOINHERIT) };
-        let write_fd = unsafe { _open_osfhandle(write_handle, libc::O_WRONLY | O_NOINHERIT) };
+        let read_fd = unsafe { libc::open_osfhandle(read_handle, O_NOINHERIT) };
+        let write_fd = unsafe { libc::open_osfhandle(write_handle, libc::O_WRONLY | O_NOINHERIT) };
 
         if read_fd == -1 || write_fd == -1 {
             unsafe {
@@ -964,7 +961,7 @@ pub(crate) mod module {
 
     #[pyfunction]
     fn dup(fd: i32, vm: &VirtualMachine) -> PyResult<i32> {
-        let fd2 = unsafe { suppress_iph!(_dup(fd)) };
+        let fd2 = unsafe { suppress_iph!(libc::dup(fd)) };
         if fd2 < 0 {
             return Err(errno_err(vm));
         }
@@ -987,7 +984,7 @@ pub(crate) mod module {
 
     #[pyfunction]
     fn dup2(args: Dup2Args, vm: &VirtualMachine) -> PyResult<i32> {
-        let result = unsafe { suppress_iph!(_dup2(args.fd, args.fd2)) };
+        let result = unsafe { suppress_iph!(libc::dup2(args.fd, args.fd2)) };
         if result < 0 {
             return Err(errno_err(vm));
         }