From 09b823d637a5226c58e8ab0de082b3a7f2e1b7f4 Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Fri, 10 Mar 2023 23:41:01 +0800
Subject: [PATCH] higher sysinfo version

---
 Cargo.lock                 | 4 ++--
 libs/hbb_common/Cargo.toml | 2 +-
 src/ipc.rs                 | 4 ++--
 src/platform/macos.rs      | 7 ++-----
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c48a69e8d..7652f4430 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5746,9 +5746,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.26.9"
+version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c18a6156d1f27a9592ee18c1a846ca8dd5c258b7179fc193ae87c74ebb666f5"
+checksum = "d3e847e2de7a137c8c2cede5095872dbb00f4f9bf34d061347e36b43322acd56"
 dependencies = [
  "cfg-if 1.0.0",
  "core-foundation-sys 0.8.3",
diff --git a/libs/hbb_common/Cargo.toml b/libs/hbb_common/Cargo.toml
index fd02639ed..2ccaa92e9 100644
--- a/libs/hbb_common/Cargo.toml
+++ b/libs/hbb_common/Cargo.toml
@@ -34,7 +34,7 @@ tokio-socks = { git = "https://github.com/open-trade/tokio-socks" }
 chrono = "0.4"
 backtrace = "0.3"
 libc = "0.2"
-sysinfo = "0.26"
+sysinfo = "0.28"
 
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 mac_address = "1.1"
diff --git a/src/ipc.rs b/src/ipc.rs
index b1b130340..22cf388f4 100644
--- a/src/ipc.rs
+++ b/src/ipc.rs
@@ -547,13 +547,13 @@ async fn check_pid(postfix: &str) {
     if let Ok(mut file) = File::open(&pid_file) {
         let mut content = String::new();
         file.read_to_string(&mut content).ok();
-        let pid = content.parse::<i32>().unwrap_or(0);
+        let pid = content.parse::<usize>().unwrap_or(0);
         if pid > 0 {
             use hbb_common::sysinfo::{ProcessExt, System, SystemExt};
             let mut sys = System::new();
             sys.refresh_processes();
             if let Some(p) = sys.process(pid.into()) {
-                if let Some(current) = sys.process((std::process::id() as i32).into()) {
+                if let Some(current) = sys.process((std::process::id() as usize).into()) {
                     if current.name() == p.name() {
                         // double check with connect
                         if connect(1000, postfix).await.is_ok() {
diff --git a/src/platform/macos.rs b/src/platform/macos.rs
index 5c4c68e2c..251211c29 100644
--- a/src/platform/macos.rs
+++ b/src/platform/macos.rs
@@ -581,7 +581,7 @@ fn check_main_window() -> bool {
     sys.refresh_processes();
     let app = format!("/Applications/{}.app", crate::get_app_name());
     let my_uid = sys
-        .process((std::process::id() as i32).into())
+        .process((std::process::id() as usize).into())
         .map(|x| x.user_id())
         .unwrap_or_default();
     for (_, p) in sys.processes().iter() {
@@ -667,9 +667,6 @@ pub fn change_resolution(name: &str, width: usize, height: usize) -> ResultType<
     Ok(())
 }
 
-
 pub fn check_super_user_permission() -> ResultType<bool> {
-    unsafe {
-        Ok(MacCheckAdminAuthorization() == YES)
-    }
+    unsafe { Ok(MacCheckAdminAuthorization() == YES) }
 }