From c4bdd2bf118114b837484af9dc2ffe9b23809067 Mon Sep 17 00:00:00 2001 From: Guido Draheim Date: Fri, 2 Mar 2018 00:09:02 +0100 Subject: [PATCH] fix to use _zzip_fnmatch #6 --- bins/unzzipdir-mem.c | 4 ++-- bins/unzzipdir-mix.c | 4 ++-- bins/unzzipdir-zip.c | 4 ++-- bins/unzzipshow.c | 2 +- test/test.zip | Bin 1361 -> 1361 bytes 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bins/unzzipdir-mem.c b/bins/unzzipdir-mem.c index 62eae42..e54cd8d 100644 --- a/bins/unzzipdir-mem.c +++ b/bins/unzzipdir-mem.c @@ -99,8 +99,8 @@ unzzip_list (int argc, char ** argv, int verbose) char* name = zzip_mem_entry_to_name (entry); for (argn=1; argn < argc; argn++) { - if (! fnmatch (argv[argn], name, - _zzip_FNM_NOESCAPE|_zzip_FNM_PATHNAME|_zzip_FNM_PERIOD)) + if (! _zzip_fnmatch (argv[argn], name, + _zzip_FNM_NOESCAPE|_zzip_FNM_PATHNAME|_zzip_FNM_PERIOD)) { char* name = zzip_mem_entry_to_name (entry); long long usize = entry->zz_usize; diff --git a/bins/unzzipdir-mix.c b/bins/unzzipdir-mix.c index 60b4428..891f77b 100644 --- a/bins/unzzipdir-mix.c +++ b/bins/unzzipdir-mix.c @@ -102,8 +102,8 @@ unzzip_list (int argc, char ** argv, int verbose) char* name = entry->d_name; for (argn=1; argn < argc; argn++) { - if (! fnmatch (argv[argn], name, - _zzip_FNM_NOESCAPE|_zzip_FNM_PATHNAME|_zzip_FNM_PERIOD)) + if (! _zzip_fnmatch (argv[argn], name, + _zzip_FNM_NOESCAPE|_zzip_FNM_PATHNAME|_zzip_FNM_PERIOD)) { long long usize = entry->st_size; if (!verbose) diff --git a/bins/unzzipdir-zip.c b/bins/unzzipdir-zip.c index ceea8bc..b66ae68 100644 --- a/bins/unzzipdir-zip.c +++ b/bins/unzzipdir-zip.c @@ -100,8 +100,8 @@ unzzip_list (int argc, char ** argv, int verbose) char* name = entry.d_name; for (argn=1; argn < argc; argn++) { - if (! fnmatch (argv[argn], name, - _zzip_FNM_NOESCAPE|_zzip_FNM_PATHNAME|_zzip_FNM_PERIOD)) + if (! _zzip_fnmatch (argv[argn], name, + _zzip_FNM_NOESCAPE|_zzip_FNM_PATHNAME|_zzip_FNM_PERIOD)) { long long usize = entry.st_size; if (!verbose) diff --git a/bins/unzzipshow.c b/bins/unzzipshow.c index 2813a09..ca215a1 100644 --- a/bins/unzzipshow.c +++ b/bins/unzzipshow.c @@ -94,7 +94,7 @@ main (int argc, char ** argv) { char* name = zzip_entry_strdup_name (entry); if (! _zzip_fnmatch (argv[argn], name, - _zzip_FNM_NOESCAPE|_zzip_FNM_PATHNAME|_zzip_FNM_PERIOD)) + _zzip_FNM_NOESCAPE|_zzip_FNM_PATHNAME|_zzip_FNM_PERIOD)) zzip_cat_file (disk, name, stdout); free (name); } diff --git a/test/test.zip b/test/test.zip index 7a505805ddbdc59e7430462dbe26f6b2f71d4635..56b324eecffda9af91b206fcc3bc63777e2099a3 100644 GIT binary patch delta 47 zcmcb}b&-oVz?+#xgn@y9gTaO&X(F!-TXNfssN}Yd`e#^}fg+Rtv1lR delta 47 zcmcb}b&-oVz?+#xgn@y9gW=fj#EHBzY@h39M18K?sDFlq87MOOABz^#=eo&Stm*)2 CSrDiI -- 2.40.0