Salastil/creamlinux-installer
1
0
Fork 0
mirror of https://github.com/Novattz/creamlinux-installer.git synced 2026-01-24 20:32:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix typo ELF magic number check

Browse Source
This commit is contained in:
Novattz
2026-01-17 20:29:54 +01:00
parent 1123012737
commit 9ba307f9f8
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src-tauri/src/utils/bitness.rs
View File

@@ -20,7 +20,7 @@ fn detect_binary_bitness(file_path: &Path) -> Option<Bitness> {
}; };
// Check for ELF magic number (0x7F 'E' 'L' 'F') // Check for ELF magic number (0x7F 'E' 'L' 'F')
if bytes.len() < 5 || &bytes[0..4] != b"\x7ELF" { if bytes.len() < 5 || &bytes[0..4] != b"\x7FELF" {
return None; return None;
} }
@@ -90,14 +90,27 @@ pub fn detect_game_bitness(game_path: &str) -> Result<Bitness, String> {
continue; continue;
} }
// Skip non-binary files early for performance
let filename = path.file_name().unwrap_or_default().to_string_lossy();
// Check for common Linux executable extensions or shared libraries
let has_binary_extension = filename.ends_with(".x86")
|| filename.ends_with(".x86_64")
|| filename.ends_with(".bin")
|| filename.ends_with(".so")
|| filename.contains(".so.")
|| filename.starts_with("lib");
// Check if file is executable // Check if file is executable
#[cfg(unix)] #[cfg(unix)]
{ {
use std::os::unix::fs::PermissionsExt; use std::os::unix::fs::PermissionsExt;
if let Ok(metadata) = fs::metadata(path) { if let Ok(metadata) = fs::metadata(path) {
let permissions = metadata.permissions(); let permissions = metadata.permissions();
// Check if executable bit is set let is_executable = permissions.mode() & 0o111 != 0;
if permissions.mode() & 0o111 == 0 {
// Skip files that are neither executable nor have binary extensions
if !is_executable && !has_binary_extension {
continue; continue;
} }
} else { } else {
@@ -105,22 +118,6 @@ pub fn detect_game_bitness(game_path: &str) -> Result<Bitness, String> {
} }
} }
// Check for common Linux executable extensions or no extension
let filename = path.file_name().unwrap_or_default().to_string_lossy();
let has_exe_extension = filename.ends_with(".x86")
|| filename.ends_with(".x86_64")
|| filename.ends_with(".bin")
|| filename.contains('.');
// Also check for .so files (shared libraries) as they indicate bitness
let is_shared_lib = filename.ends_with(".so")
|| filename.contains(".so")
|| filename.starts_with("lib");
if !has_exe_extension && !is_shared_lib {
continue;
}
// Detect bitness // Detect bitness
if let Some(bitness) = detect_binary_bitness(path) { if let Some(bitness) = detect_binary_bitness(path) {
debug!("Found {:?} binary: {}", bitness, path.display()); debug!("Found {:?} binary: {}", bitness, path.display());
@@ -139,10 +136,10 @@ pub fn detect_game_bitness(game_path: &str) -> Result<Bitness, String> {
// 4. If we found neither, return an error // 4. If we found neither, return an error
if !bit64_binaries.is_empty() && bit32_binaries.is_empty() { if !bit64_binaries.is_empty() && bit32_binaries.is_empty() {
info!("Detected 64-bit game (Only 64-bit binaries found"); info!("Detected 64-bit game (Only 64-bit binaries found)");
Ok(Bitness::Bit64) Ok(Bitness::Bit64)
} else if !bit32_binaries.is_empty() && bit64_binaries.is_empty() { } else if !bit32_binaries.is_empty() && bit64_binaries.is_empty() {
info!("Detected 32-bit game (Only 32-bit binaries found"); info!("Detected 32-bit game (Only 32-bit binaries found)");
Ok(Bitness::Bit32) Ok(Bitness::Bit32)
} else if !bit64_binaries.is_empty() && !bit32_binaries.is_empty() { } else if !bit64_binaries.is_empty() && !bit32_binaries.is_empty() {
warn!( warn!(