device_path: make device paths suck less (part 2)

Author: phip1611

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
 ## uefi - [Unreleased]
+- added `DevicePath::to_boxed`, `DevicePath::to_owned`, and `DevicePath::raw`
+- added `DevicePathInstance::to_boxed`, `DevicePathInstance::to_owned`, and `DevicePathInstance::raw`
 
 ## uefi-macros - [Unreleased]
 

uefi/src/fs/file_system/error.rs

@@ -1,7 +1,6 @@
 use crate::fs::{PathBuf, PathError};
 use alloc::string::FromUtf8Error;
-use core::fmt::Debug;
-use core::fmt::{self, Display, Formatter};
+use core::fmt::{self, Debug, Display, Formatter};
 
 /// All errors that can happen when working with the [`FileSystem`].
 ///

uefi/src/proto/device_path/mod.rs

@@ -80,6 +80,8 @@ mod device_path_gen;
 pub use device_path_gen::{
     acpi, bios_boot_spec, end, hardware, media, messaging, DevicePathNodeEnum,
 };
+#[cfg(feature = "alloc")]
+use {alloc::borrow::ToOwned, alloc::boxed::Box};
 
 use crate::proto::{unsafe_protocol, ProtocolPointer};
 use core::ffi::c_void;
@@ -226,6 +228,20 @@ impl DevicePathInstance {
             stop_condition: StopCondition::AnyEndNode,
         }
     }
+
+    /// Returns a copy to the underlying slice of bytes.
+    #[must_use]
+    pub const fn raw(&self) -> &[u8] {
+        &self.data
+    }
+
+    /// Returns a boxed copy of that value.
+    #[cfg(feature = "alloc")]
+    pub fn to_boxed(&self) -> Box<Self> {
+        let data = self.data.to_owned();
+        let data = data.into_boxed_slice();
+        unsafe { mem::transmute(data) }
+    }
 }
 
 impl Debug for DevicePathInstance {
@@ -242,6 +258,15 @@ impl PartialEq for DevicePathInstance {
     }
 }
 
+#[cfg(feature = "alloc")]
+impl ToOwned for DevicePathInstance {
+    type Owned = Box<DevicePathInstance>;
+
+    fn to_owned(&self) -> Self::Owned {
+        self.to_boxed()
+    }
+}
+
 /// Device path protocol.
 ///
 /// A device path contains one or more device path instances made of up
@@ -326,6 +351,20 @@ impl DevicePath {
             stop_condition: StopCondition::EndEntireNode,
         }
     }
+
+    /// Returns a copy to the underlying slice of bytes.
+    #[must_use]
+    pub const fn raw(&self) -> &[u8] {
+        &self.data
+    }
+
+    /// Returns a boxed copy of that value.
+    #[cfg(feature = "alloc")]
+    pub fn to_boxed(&self) -> Box<Self> {
+        let data = self.data.to_owned();
+        let data = data.into_boxed_slice();
+        unsafe { mem::transmute(data) }
+    }
 }
 
 impl Debug for DevicePath {
@@ -342,6 +381,15 @@ impl PartialEq for DevicePath {
     }
 }
 
+#[cfg(feature = "alloc")]
+impl ToOwned for DevicePath {
+    type Owned = Box<DevicePath>;
+
+    fn to_owned(&self) -> Self::Owned {
+        self.to_boxed()
+    }
+}
+
 /// Iterator over the [`DevicePathInstance`]s in a [`DevicePath`].
 ///
 /// This struct is returned by [`DevicePath::instance_iter`].
@@ -644,6 +692,7 @@ impl Deref for LoadedImageDevicePath {
 mod tests {
     use super::*;
     use alloc::vec::Vec;
+    use core::mem::size_of;
 
     /// Create a node to `path` from raw data.
     fn add_node(path: &mut Vec<u8>, device_type: u8, sub_type: u8, node_data: &[u8]) {
@@ -748,4 +797,16 @@ mod tests {
         // Only two instances.
         assert!(iter.next().is_none());
     }
+
+    #[test]
+    fn test_to_owned() {
+        assert_eq!(size_of::<&DevicePath>(), size_of::<&[u8]>());
+
+        let raw_data = create_raw_device_path();
+        let dp = unsafe { DevicePath::from_ffi_ptr(raw_data.as_ptr().cast()) };
+
+        let owned_dp = dp.to_owned();
+        let owned_dp_ref = &*owned_dp;
+        assert_eq!(owned_dp_ref, dp)
+    }
 }