X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwildcard.c;h=febe8ee039def9e92f435664756ff53ce2801837;hb=2c67dab41d653413cbec03445da14e1eaf2d5713;hp=234ee91ce72d3eadb6fefc68caf4d654741116c4;hpb=ced16a28e197645a40fa04a54793d117a04526d7;p=wimlib

diff --git a/src/wildcard.c b/src/wildcard.c
index 234ee91c..febe8ee0 100644
--- a/src/wildcard.c
+++ b/src/wildcard.c
@@ -7,20 +7,18 @@
 /*
  * Copyright (C) 2013 Eric Biggers
  *
- * This file is part of wimlib, a library for working with WIM files.
+ * This file is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
  *
- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
- *
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -28,6 +26,7 @@
 #endif
 
 #include <ctype.h>
+
 #include "wimlib/dentry.h"
 #include "wimlib/encoding.h"
 #include "wimlib/error.h"
@@ -189,7 +188,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 +196,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 +
@@ -326,7 +326,7 @@ expand_wildcard(WIMStruct *wim,
 	struct wim_dentry *root;
 	int ret;
 
-	root = wim_root_dentry(wim);
+	root = wim_get_current_root_dentry(wim);
 	if (root == NULL)
 		goto no_match;