From 6f6b0ade06db835cd865f57ae3e80280f19cd9c7 Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Wed, 29 Nov 2023 15:37:03 +0800
Subject: [PATCH] Correct cpio's norm_path

---
 native/src/boot/cpio.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/native/src/boot/cpio.rs b/native/src/boot/cpio.rs
index 7f8d25580..36e012d77 100644
--- a/native/src/boot/cpio.rs
+++ b/native/src/boot/cpio.rs
@@ -620,11 +620,10 @@ fn align_4(x: usize) -> usize {
 
 #[inline(always)]
 fn norm_path(path: &str) -> String {
-    path.strip_prefix('/')
-        .unwrap_or(path)
-        .strip_suffix('/')
-        .unwrap_or(path)
-        .to_string()
+    path.split('/')
+        .filter(|x| !x.is_empty())
+        .intersperse("/")
+        .collect()
 }
 
 fn parse_mode(s: &str) -> Result<mode_t, String> {