Simplified parent/cur dir deletion avoidance in rm

just-an-engineer · AnirbanHalder654322 · just-an-engineer · commit cfc82c6ce79a · 2024-08-08T11:25:00.000-04:00
Co-authored-by: Anirban Halder &lt;anirbanhalder752@gmail.com&gt;
diff --git a/src/uu/rm/src/rm.rs b/src/uu/rm/src/rm.rs
@@ -326,17 +326,20 @@ pub fn remove(files: &[&OsStr], options: &Options) -> bool {
 fn handle_dir(path: &Path, options: &Options) -> bool {
     let mut had_err = false;
 
-    let path_as_str = path.as_os_str().to_str().unwrap();
     #[cfg(unix)]
-    if path_as_str.ends_with("/.") || path_as_str.ends_with("/..") {
-        show_error!(
-            "refusing to remove '.' or '..' directory: skipping {}",
-            path.quote()
-        );
-        return true;
-    }
+    let del = "/";
     #[cfg(windows)]
-    if path_as_str.ends_with("\\.") || path_as_str.ends_with("\\..") {
+    let del = "\\";
+
+    if path
+        .to_str()
+        .unwrap()
+        .ends_with(format!("{}.", del).as_str())
+        || path
+            .to_str()
+            .unwrap()
+            .ends_with(format!("{}..", del).as_str())
+    {
         show_error!(
             "refusing to remove '.' or '..' directory: skipping {}",
             path.quote()
