mirror of https://gitlab.com/qemu-project/qemu
util/cutils: Skip "." when looking for next directory component
When looking for the next directory component, a "." component is now skipped. This fixes the path(s) used for firmware lookup for the prefix == bindir case which is standard for QEMU on Windows and where the internally used bindir value ends with "/.". Signed-off-by: Stefan Weil <sw@weilnetz.de> Message-Id: <20210208205752.2488774-1-sw@weilnetz.de> Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
b0019c995e
commit
342e3a4f20
|
@ -916,7 +916,8 @@ static inline bool starts_with_prefix(const char *dir)
|
||||||
static inline const char *next_component(const char *dir, int *p_len)
|
static inline const char *next_component(const char *dir, int *p_len)
|
||||||
{
|
{
|
||||||
int len;
|
int len;
|
||||||
while (*dir && G_IS_DIR_SEPARATOR(*dir)) {
|
while ((*dir && G_IS_DIR_SEPARATOR(*dir)) ||
|
||||||
|
(*dir == '.' && (G_IS_DIR_SEPARATOR(dir[1]) || dir[1] == '\0'))) {
|
||||||
dir++;
|
dir++;
|
||||||
}
|
}
|
||||||
len = 0;
|
len = 0;
|
||||||
|
|
Loading…
Reference in New Issue