Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions crates/brioche-packed-plain-exec/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![warn(clippy::std_instead_of_core)]

use std::{ffi::OsString, os::unix::process::CommandExt as _, path::PathBuf, process::ExitCode};

use bstr::ByteSlice as _;
Expand Down
3 changes: 3 additions & 0 deletions crates/brioche-packed-userland-exec/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ thiserror = "2.0.17"

[target.'cfg(target_os = "linux")'.dependencies]
userland-execve = "0.2.0"

[lints]
workspace = true
15 changes: 10 additions & 5 deletions crates/brioche-packed-userland-exec/src/linux.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#![cfg(target_os = "linux")]

use std::ffi::{CStr, CString};
use core::ffi::CStr;
use std::ffi::CString;

use bstr::ByteSlice as _;

Expand All @@ -11,7 +12,11 @@ unsafe extern "C" {
}

#[inline(always)]
#[allow(clippy::missing_safety_doc)]
#[allow(
clippy::inline_always,
clippy::missing_safety_doc,
clippy::similar_names
)]
pub unsafe fn entrypoint(argc: libc::c_int, argv: *const *const libc::c_char) -> libc::c_int {
let mut args = vec![];
let mut env_vars = vec![];
Expand Down Expand Up @@ -162,13 +167,13 @@ enum PackedError {
ResourceNotFound,
}

impl std::fmt::Display for PackedError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
impl core::fmt::Display for PackedError {
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
f.write_str(error_summary(self))
}
}

fn error_summary(error: &PackedError) -> &'static str {
const fn error_summary(error: &PackedError) -> &'static str {
match error {
PackedError::IoError(_) => "io error",
PackedError::ExtractPackError(error) => match error {
Expand Down
3 changes: 2 additions & 1 deletion crates/brioche-packed-userland-exec/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#![cfg_attr(all(target_os = "linux", not(test)), no_main)]
#![warn(clippy::std_instead_of_core)]

mod linux;

cfg_if::cfg_if! {
if #[cfg(target_os = "linux")] {
#[cfg_attr(not(test), unsafe(no_mangle))]
#[allow(clippy::missing_safety_doc)]
#[allow(clippy::missing_safety_doc, clippy::similar_names)]
pub unsafe extern "C" fn main(argc: libc::c_int, argv: *const *const libc::c_char) -> libc::c_int {
unsafe {
linux::entrypoint(argc, argv)
Expand Down