Skip to content

dynload: refactor to use libc crate for system calls #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antoyo merged 1 commit into from
Dec 2, 2025
Merged

dynload: refactor to use libc crate for system calls #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions gccjit_sys/src/dynload.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,8 @@ pub use self::platform::Library;

#[cfg(unix)]
mod platform {
use std::ffi::{CStr, c_char, c_int, c_void};

#[link(name="dl")]
extern "C" {
fn dlopen(filename: *const i8, flag: c_int) -> *mut c_void;
fn dlsym(handle: *mut c_void, symbol: *const i8) -> *mut c_void;
fn dlclose(handle: *mut c_void) -> c_int;
fn dlerror() -> *const c_char;
}
use std::ffi::{CStr, c_void};
use libc::{c_char, RTLD_NOW};

pub struct Library(*mut c_void);

Expand All @@ -21,8 +14,8 @@ mod platform {

impl Library {
pub unsafe fn open(path: &CStr) -> Result<Self, String> {
const RTLD_NOW: c_int = 2;
let handle = dlopen(path.as_ptr(), RTLD_NOW);
use libc::dlopen;
let handle = dlopen(path.as_ptr() as *const c_char, RTLD_NOW);
if handle.is_null() {
Self::error()
}
Expand All @@ -32,7 +25,8 @@ mod platform {
}

pub unsafe fn get(&self, sym: &CStr) -> Result<*mut (), String> {
let ptr = dlsym(self.0, sym.as_ptr());
use libc::dlsym;
let ptr = dlsym(self.0, sym.as_ptr() as *const c_char);
if ptr.is_null() {
Self::error()
}
Expand All @@ -42,6 +36,7 @@ mod platform {
}

unsafe fn error<T>() -> Result<T, String> {
use libc::dlerror;
let cstr = dlerror();
let cstr = CStr::from_ptr(cstr);
let string = cstr.to_str()
Expand All @@ -53,7 +48,9 @@ mod platform {

impl Drop for Library {
fn drop(&mut self) {
unsafe { dlclose(self.0); }
unsafe {
libc::dlclose(self.0);
}
}
}
}
Expand All @@ -62,11 +59,12 @@ mod platform {
mod platform {
use std::ffi::{CStr, OsString, c_void};
use std::os::windows::ffi::OsStrExt;
use libc::c_char;

#[link(name="kernel32")]
extern "system" {
fn LoadLibraryW(lpLibFileName: *const u16) -> *mut c_void;
fn GetProcAddress(hModule: *mut c_void, lpProcName: *const u8) -> *mut c_void;
fn GetProcAddress(hModule: *mut c_void, lpProcName: *const c_char) -> *mut c_void;
fn FreeLibrary(hLibModule: *mut c_void);
}

Expand All @@ -90,7 +88,7 @@ mod platform {
}

pub unsafe fn get(&self, sym: &CStr) -> Result<*mut (), String> {
let ptr = GetProcAddress(self.0, sym.as_ptr() as *const _);
let ptr = GetProcAddress(self.0, sym.as_ptr() as *const c_char);
if ptr.is_null() {
Err("cannot load symbol".to_string())
}
Expand Down
Loading