Merge branch 'odin' of codeberg.org:jeang3nie/hpk into odin

Make it possible to compile on FreeBSD by conditionally using
std::os::<linux,freebsd>::fs::MetadataExt. Not intending to use hpk on FreeBSD but this enables development from either platform
2023-07-08 18:42:27 -04:00 · 2023-06-24 10:18:48 -04:00
2 changed files with 7 additions and 1 deletions
--- a/src/tar/header.rs
+++ b/src/tar/header.rs
@ -8,10 +8,16 @@ use std::{
    fs::{self, Metadata},
    io,
    ops::Deref,
-    os::{linux::fs::MetadataExt, unix::fs::FileTypeExt},
+    os::unix::fs::FileTypeExt,
    path::PathBuf,
 };

+#[cfg(target_os = "linux")]
+use std::os::linux::fs::MetadataExt;
+
+#[cfg(target_os = "freebsd")]
+use std::os::freebsd::fs::MetadataExt;
+
 #[repr(u8)]
 pub enum FileType {
    Normal = 0x30,
--- a/test/2.tar
+++ b/test/2.tar
Author	SHA1	Message	Date
Nathan Fisher	150b728172	Merge branch 'odin' of codeberg.org:jeang3nie/hpk into odin	2023-07-08 18:42:27 -04:00
Nathan Fisher	35dfc99176	Make it possible to compile on FreeBSD by conditionally using std::os::<linux,freebsd>::fs::MetadataExt. Not intending to use hpk on FreeBSD but this enables development from either platform	2023-06-24 10:18:48 -04:00