X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwildcard.c;h=408b0fe32e73b1cd3df618c9be8b950a174633d7;hb=e65e912be5d6b5cc5e1256b60975d1ff579dee7b;hp=958829a2d7e679c3aa0f1b43dc4b16b662e47b7d;hpb=23ea88c8b6eae44e1a50b104f8a5d3314b59c4e9;p=wimlib diff --git a/src/wildcard.c b/src/wildcard.c index 958829a2..408b0fe3 100644 --- a/src/wildcard.c +++ b/src/wildcard.c @@ -189,7 +189,7 @@ static int match_dentry(struct wim_dentry *cur_dentry, struct match_dentry_ctx *ctx) { const tchar *name; - size_t name_len; + size_t name_nchars; int ret; if (cur_dentry->file_name_nbytes == 0) @@ -197,15 +197,16 @@ match_dentry(struct wim_dentry *cur_dentry, struct match_dentry_ctx *ctx) ret = utf16le_get_tstr(cur_dentry->file_name, cur_dentry->file_name_nbytes, - &name, &name_len); + &name, &name_nchars); if (ret) return ret; - name_len /= sizeof(tchar); + name_nchars /= sizeof(tchar); - if (match_wildcard(name, - &ctx->wildcard_path[ctx->cur_component_offset], - ctx->cur_component_len, - ctx->case_insensitive)) + if (do_match_wildcard(name, + name_nchars, + &ctx->wildcard_path[ctx->cur_component_offset], + ctx->cur_component_len, + ctx->case_insensitive)) { switch (wildcard_status(&ctx->wildcard_path[ ctx->cur_component_offset +