From b08fc8586fe635c8d894146e788cd53f7d78876f Mon Sep 17 00:00:00 2001 From: Ryuichi Ueda Date: Fri, 6 Dec 2024 16:54:12 +0900 Subject: [PATCH 1/5] Fix --- src/elements/word/path_expansion.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/elements/word/path_expansion.rs b/src/elements/word/path_expansion.rs index 4424084f..66582209 100644 --- a/src/elements/word/path_expansion.rs +++ b/src/elements/word/path_expansion.rs @@ -21,6 +21,6 @@ fn expand(pattern: &str) -> Vec { let div = pattern.split("/"); let last = div.last().unwrap(); let dir = &pattern[0..pattern.len()-last.len()]; - directory::glob(dir, pattern) + directory::glob(dir, pattern.split("/").last().unwrap()) } From f1e15ecee804dd94bea428664d82505b63a06395 Mon Sep 17 00:00:00 2001 From: Ryuichi Ueda Date: Sun, 8 Dec 2024 17:00:51 +0900 Subject: [PATCH 2/5] Add header --- src/utils/directory.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/utils/directory.rs b/src/utils/directory.rs index 381434fd..92a1d4c0 100644 --- a/src/utils/directory.rs +++ b/src/utils/directory.rs @@ -1,3 +1,6 @@ +//SPDX-FileCopyrightText: 2024 Ryuichi Ueda ryuichiueda@gmail.com +//SPDX-License-Identifier: BSD-3-Clause + use std::fs::DirEntry; use std::path::Path; From 608edfe6cd64b5af69545808fe50189f1efdef7a Mon Sep 17 00:00:00 2001 From: Ryuichi Ueda Date: Sun, 2 Feb 2025 11:00:45 +0900 Subject: [PATCH 3/5] Revive old code --- Cargo.toml | 2 +- src/utils/glob.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 243c2b4e..d316d8ba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sush" -version = "2025.3.1" +version = "2025.4.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src/utils/glob.rs b/src/utils/glob.rs index 1d7bba68..f17e9142 100644 --- a/src/utils/glob.rs +++ b/src/utils/glob.rs @@ -67,8 +67,8 @@ fn eat_string(pattern: &mut String, ans: &mut Vec) -> bool { } fn consume(remaining: &mut String, cutpos: usize) -> String { - let cut = remaining[0..cutpos].to_string(); - *remaining = remaining.split_off(cutpos); - - cut + let back = remaining.split_off(cutpos); + let front = remaining.clone(); + *remaining = back; + front } From 15d42f46e260ed1fb5d9bbf940985a68cd87a0ad Mon Sep 17 00:00:00 2001 From: Ryuichi Ueda Date: Sun, 2 Feb 2025 11:08:30 +0900 Subject: [PATCH 4/5] Update version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index d316d8ba..8cdfd2ec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sush" -version = "2025.4.0" +version = "2025.4.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From f3a7ad98d160c447f40a95ee32a3b12e9a530c61 Mon Sep 17 00:00:00 2001 From: Ryuichi Ueda Date: Sun, 2 Feb 2025 11:50:58 +0900 Subject: [PATCH 5/5] Fix --- src/elements/word/path_expansion.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/elements/word/path_expansion.rs b/src/elements/word/path_expansion.rs index 66582209..59909a75 100644 --- a/src/elements/word/path_expansion.rs +++ b/src/elements/word/path_expansion.rs @@ -21,6 +21,6 @@ fn expand(pattern: &str) -> Vec { let div = pattern.split("/"); let last = div.last().unwrap(); let dir = &pattern[0..pattern.len()-last.len()]; - directory::glob(dir, pattern.split("/").last().unwrap()) + directory::glob(dir, last) }