From db692eee7cbb37aa094d3e90c99c4d4db10ed012 Mon Sep 17 00:00:00 2001
From: Alex O'Brien <3541@3541.website>
Date: Sun, 16 Jun 2024 15:12:09 +1000
Subject: [PATCH] Make to_str no_std compatible

This patch allows the use of the (applicable subset of the) to_str
module possible under no_std with or without the alloc crate.

To this end, a new feature flag for alloc is introduced (implied by
std). All use of String in to_str is gated behind the alloc feature.
---
 Cargo.toml    |  5 +++--
 src/lib.rs    |  3 +++
 src/to_str.rs | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 9373696..a1dc1a4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,8 +19,9 @@ name = "elf"
 [dependencies]
 
 [features]
-default = ["std", "to_str"]
-std = []
+default = ["alloc" , "std", "to_str"]
+alloc = []
+std = ["alloc"]
 to_str = []
 # Enable for nightly feature(error_in_core) to impl core::error::Error on ParseError
 nightly = []
diff --git a/src/lib.rs b/src/lib.rs
index 5ac480b..91d45b0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -131,6 +131,9 @@
 #![deny(missing_debug_implementations)]
 #![forbid(unsafe_code)]
 
+#[cfg(all(feature = "alloc", not(feature = "std")))]
+extern crate alloc;
+
 pub mod abi;
 
 pub mod compression;
diff --git a/src/to_str.rs b/src/to_str.rs
index 0f1e2e2..8987a69 100644
--- a/src/to_str.rs
+++ b/src/to_str.rs
@@ -1,6 +1,12 @@
 //! Optional module for getting string representations of ELF constants
 use crate::abi;
 
+#[cfg(all(feature = "alloc", not(feature = "std")))]
+use alloc::{
+    format,
+    string::{String, ToString},
+};
+
 pub fn e_osabi_to_str(e_osabi: u8) -> Option<&'static str> {
     match e_osabi {
         abi::ELFOSABI_SYSV => Some("ELFOSABI_SYSV"),
@@ -24,6 +30,7 @@ pub fn e_osabi_to_str(e_osabi: u8) -> Option<&'static str> {
     }
 }
 
+#[cfg(feature = "alloc")]
 pub fn e_osabi_to_string(e_osabi: u8) -> String {
     match e_osabi_to_str(e_osabi) {
         Some(s) => s.to_string(),
@@ -53,6 +60,7 @@ pub fn e_type_to_str(e_type: u16) -> Option<&'static str> {
     }
 }
 
+#[cfg(feature = "alloc")]
 pub fn e_type_to_string(e_type: u16) -> String {
     match e_type_to_str(e_type) {
         Some(s) => s.to_string(),
@@ -444,6 +452,7 @@ pub fn e_machine_to_str(e_machine: u16) -> Option<&'static str> {
     }
 }
 
+#[cfg(feature = "alloc")]
 pub fn e_machine_to_string(e_machine: u16) -> String {
     match e_machine_to_str(e_machine) {
         Some(s) => s.to_string(),
@@ -480,6 +489,7 @@ pub fn sh_type_to_str(sh_type: u32) -> Option<&'static str> {
     }
 }
 
+#[cfg(feature = "alloc")]
 pub fn sh_type_to_string(sh_type: u32) -> String {
     match sh_type_to_str(sh_type) {
         Some(s) => s.to_string(),
@@ -487,6 +497,7 @@ pub fn sh_type_to_string(sh_type: u32) -> String {
     }
 }
 
+#[cfg(feature = "alloc")]
 pub fn p_flags_to_string(p_flags: u32) -> String {
     match p_flags < 8 {
         true => {
@@ -517,6 +528,7 @@ pub fn p_type_to_str(p_type: u32) -> Option<&'static str> {
     }
 }
 
+#[cfg(feature = "alloc")]
 pub fn p_type_to_string(p_type: u32) -> String {
     match p_type_to_str(p_type) {
         Some(s) => s.to_string(),
@@ -538,6 +550,7 @@ pub fn st_symtype_to_str(st_symtype: u8) -> Option<&'static str> {
     }
 }
 
+#[cfg(feature = "alloc")]
 pub fn st_symtype_to_string(st_symtype: u8) -> String {
     match st_symtype_to_str(st_symtype) {
         Some(s) => s.to_string(),
@@ -555,6 +568,7 @@ pub fn st_bind_to_str(st_bind: u8) -> Option<&'static str> {
     }
 }
 
+#[cfg(feature = "alloc")]
 pub fn st_bind_to_string(st_bind: u8) -> String {
     match st_bind_to_str(st_bind) {
         Some(s) => s.to_string(),
@@ -572,6 +586,7 @@ pub fn st_vis_to_str(st_vis: u8) -> Option<&'static str> {
     }
 }
 
+#[cfg(feature = "alloc")]
 pub fn st_vis_to_string(st_vis: u8) -> String {
     match st_vis_to_str(st_vis) {
         Some(s) => s.to_string(),