motiejus/zig
1
Fork 0
Code Releases Activity

fs.Walker: Fix basename missing its first character for direct children of the initial directory

Browse Source 
Closes #9557
This commit is contained in:
Ryan Liptak
2021-08-13 16:20:51 -07:00
parent 0686954802
commit 8ff49966bc
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/std/fs.zig
View File

@@ -763,11 +763,12 @@ pub const Dir = struct {
while (self.stack.items.len != 0) {
// `top` becomes invalid after appending to `self.stack`
var top = &self.stack.items[self.stack.items.len - 1];
const dirname_len = top.dirname_len;
var dirname_len = top.dirname_len;
if (try top.iter.next()) |base| {
self.name_buffer.shrinkRetainingCapacity(dirname_len);
if (self.name_buffer.items.len != 0) {
try self.name_buffer.append(path.sep);
dirname_len += 1;
}
try self.name_buffer.appendSlice(base.name);
if (base.kind == .Directory) {
@@ -786,7 +787,7 @@ pub const Dir = struct {
}
return WalkerEntry{
.dir = top.iter.dir,
.basename = self.name_buffer.items[dirname_len + 1 ..],
.basename = self.name_buffer.items[dirname_len..],
.path = self.name_buffer.items,
.kind = base.kind,
};