80486DX2-66/taisei
1
0
Fork 1
Code Issues Activity

vfs/union: fix subdir lookup order lottery

Browse source
This commit is contained in:
Andrei Alexeyev 2024-09-29 06:02:07 +02:00
parent 3fdc62eeb8
commit cae66eeadc
No known key found for this signature in database
GPG key ID: 72D26128040B9690
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/vfs/union.c
View file

@ -40,6 +40,7 @@ static VFSNode *vfs_union_locate(VFSNode *node, const char *path) {
}
VFSNode *dirs[unode->members.num_elements];
VFSNode **dirs_top = dirs + ARRAY_SIZE(dirs) - 1;
int num_dirs = 0;
dynarray_foreach_elem_reversed(&unode->members, VFSNode **member, {
@ -57,7 +58,8 @@ static VFSNode *vfs_union_locate(VFSNode *node, const char *path) {
}
if(subinfo.is_dir) {
dirs[num_dirs++] = subnode;
dirs_top[-num_dirs] = subnode;
++num_dirs;
} else {
if(num_dirs == 0) {
return subnode;
@ -73,11 +75,11 @@ static VFSNode *vfs_union_locate(VFSNode *node, const char *path) {
}
if(num_dirs == 1) {
return dirs[0];
return dirs_top[0];
}
auto subunion = VFS_ALLOC(VFSUnionNode);
dynarray_set_elements(&subunion->members, num_dirs, dirs);
dynarray_set_elements(&subunion->members, num_dirs, &dirs_top[1 - num_dirs]);
return &subunion->as_generic;
}