fixing linux build

GyulyVGC · Mar 4, 2024 · 3e71fa9 · 3e71fa9
1 parent c2806e2
commit 3e71fa9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,4 +1,4 @@
-use std::fmt::Display;
+// use std::fmt::Display;
 use std::net::SocketAddr;
 
 // use netstat2::{get_sockets_info, AddressFamilyFlags, ProtocolFlags, ProtocolSocketInfo, TcpState};

diff --git a/src/platform/linux.rs b/src/platform/linux.rs
@@ -1,5 +1,4 @@
 use once_cell::sync::Lazy;
-use procfs::process::Stat;
 use rustix::fs::{AtFlags, Mode, OFlags};
 use std::collections::HashMap;
 use std::fs::File;
@@ -11,9 +10,9 @@ use std::str::FromStr;
 
 const ROOT: &str = "/proc";
 
-static KERNEL: Lazy<Option<&str>> = Lazy::new(|| {
+static KERNEL: Lazy<Option<String>> = Lazy::new(|| {
     std::fs::read_to_string("/proc/sys/kernel/osreleas")
-        .and_then(|s| Ok(s.trim()))
+        .and_then(|s| Ok(s.trim().to_owned()))
         .ok()
 });
 
@@ -39,7 +38,7 @@ fn get_all_processes() -> Vec<Process> {
 
                 // for 2.6.39 <= kernel < 3.6 fstat doesn't support O_PATH see https://github.com/eminence/procfs/issues/265
                 let flags = match *KERNEL {
-                    Some(v) if v < "3.6.0" => OFlags::DIRECTORY | OFlags::CLOEXEC,
+                    Some(v) if v < String::from("3.6.0") => OFlags::DIRECTORY | OFlags::CLOEXEC,
                     Some(_) | None => OFlags::PATH | OFlags::DIRECTORY | OFlags::CLOEXEC,
                 };
                 let file =
@@ -72,7 +71,7 @@ fn build_inode_process_map(processes: Vec<Process>) -> HashMap<u64, PidName> {
     let mut map: HashMap<u64, PidName> = HashMap::new();
     for process in processes {
         let read = rustix::fs::openat(
-            process.fd,
+            &process.fd,
             "stat",
             OFlags::RDONLY | OFlags::CLOEXEC,
             Mode::empty(),
@@ -155,7 +154,7 @@ fn get_socket_inodes<P: AsRef<Path>, Q: AsRef<Path>>(
     let root = base.as_ref().join(p);
     // for 2.6.39 <= kernel < 3.6 fstat doesn't support O_PATH see https://github.com/eminence/procfs/issues/265
     let flags = match *KERNEL {
-        Some(v) if v < "3.6.0" => OFlags::NOFOLLOW | OFlags::CLOEXEC,
+        Some(v) if v < String::from("3.6.0") => OFlags::NOFOLLOW | OFlags::CLOEXEC,
         Some(_) | None => OFlags::NOFOLLOW | OFlags::PATH | OFlags::CLOEXEC,
     };
     let file = rustix::fs::openat(dirfd, p, flags, Mode::empty()).unwrap();