From b3a42391ab802b198792684cb2b21782fb9d7920 Mon Sep 17 00:00:00 2001
From: Guido Draheim <guidod@gmx.de>
Date: Thu, 1 Mar 2018 23:01:26 +0100
Subject: [PATCH] use 'zzip/__fnmatch.h' defines #6

---
 bins/unzip-mem.c     | 7 +------
 bins/unzzipcat-big.c | 2 +-
 bins/unzzipcat-mem.c | 2 +-
 bins/unzzipcat-mix.c | 2 +-
 bins/unzzipcat-zip.c | 2 +-
 bins/unzzipdir-big.c | 7 +------
 bins/unzzipdir-mem.c | 9 ++-------
 bins/unzzipdir-mix.c | 9 ++-------
 bins/unzzipdir-zip.c | 9 ++-------
 bins/unzzipshow.c    | 9 ++-------
 10 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/bins/unzip-mem.c b/bins/unzip-mem.c
index b20bf37..c45cb72 100644
--- a/bins/unzip-mem.c
+++ b/bins/unzip-mem.c
@@ -8,6 +8,7 @@
 #include <zlib.h> /* crc32 */
 
 #include <zzip/memdisk.h>
+#include <zzip/__fnmatch.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -21,12 +22,6 @@
 
 #include <time.h>
 
-#ifdef ZZIP_HAVE_FNMATCH_H
-#include <fnmatch.h>
-#else
-#define fnmatch(x,y,z) strcmp(x,y)
-#endif
-
 #define ___ {
 #define ____ }
 
diff --git a/bins/unzzipcat-big.c b/bins/unzzipcat-big.c
index 7ab6bad..982d262 100644
--- a/bins/unzzipcat-big.c
+++ b/bins/unzzipcat-big.c
@@ -136,7 +136,7 @@ static int unzzip_cat (int argc, char ** argv, int extract)
 	    char* name = zzip_entry_strdup_name (entry);
 	    DBG3(".. check '%s' to zip '%s'", argv[argn], name);
 	    if (! _zzip_fnmatch (argv[argn], name, 
-		FNM_NOESCAPE|FNM_PATHNAME|FNM_PERIOD))
+		_zzip_FNM_NOESCAPE|_zzip_FNM_PATHNAME|_zzip_FNM_PERIOD))
 	    {
 	        FILE* out = stdout;
 	        if (extract) out = create_fopen(name, "wb", 1);
diff --git a/bins/unzzipcat-mem.c b/bins/unzzipcat-mem.c
index 13cca3a..d13029c 100644
--- a/bins/unzzipcat-mem.c
+++ b/bins/unzzipcat-mem.c
@@ -143,7 +143,7 @@ static int unzzip_cat (int argc, char ** argv, int extract)
 	{
 	    char* name = zzip_mem_entry_to_name (entry);
 	    if (! _zzip_fnmatch (argv[argn], name, 
-		FNM_NOESCAPE|FNM_PATHNAME|FNM_PERIOD))
+		_zzip_FNM_NOESCAPE|_zzip_FNM_PATHNAME|_zzip_FNM_PERIOD))
 	    {
 	        FILE* out = stdout;
 	        if (extract) out = create_fopen(name, "wb", 1);
diff --git a/bins/unzzipcat-mix.c b/bins/unzzipcat-mix.c
index aa9b86c..91c2f00 100644
--- a/bins/unzzipcat-mix.c
+++ b/bins/unzzipcat-mix.c
@@ -143,7 +143,7 @@ static int unzzip_cat (int argc, char ** argv, int extract)
 	    for (argn=1; argn < argc; argn++)
 	    {
 		if (! _zzip_fnmatch (argv[argn], name, 
-		    FNM_NOESCAPE|FNM_PATHNAME|FNM_PERIOD))
+		    _zzip_FNM_NOESCAPE|_zzip_FNM_PATHNAME|_zzip_FNM_PERIOD))
 	        {
 	             FILE* out = stdout;
 	             char* zip_name = argv[1];
diff --git a/bins/unzzipcat-zip.c b/bins/unzzipcat-zip.c
index 216be41..2810f85 100644
--- a/bins/unzzipcat-zip.c
+++ b/bins/unzzipcat-zip.c
@@ -143,7 +143,7 @@ static int unzzip_cat (int argc, char ** argv, int extract)
 	    for (argn=1; argn < argc; argn++)
 	    {
 		if (! _zzip_fnmatch (argv[argn], name, 
-		    FNM_NOESCAPE|FNM_PATHNAME|FNM_PERIOD))
+		    _zzip_FNM_NOESCAPE|_zzip_FNM_PATHNAME|_zzip_FNM_PERIOD))
 	        {
 	            FILE* out = stdout;
 	            if (extract) out = create_fopen(name, "wb", 1);
diff --git a/bins/unzzipdir-big.c b/bins/unzzipdir-big.c
index e35648a..7b66875 100644
--- a/bins/unzzipdir-big.c
+++ b/bins/unzzipdir-big.c
@@ -9,17 +9,12 @@
 
 #include <zzip/fseeko.h>
 #include <zzip/fetch.h>
+#include <zzip/__fnmatch.h>
 #include <stdlib.h>
 #include <string.h>
 #include "unzzipdir-zip.h"
 #include "unzzip-states.h"
 
-#ifdef ZZIP_HAVE_FNMATCH_H
-#include <fnmatch.h>
-#else
-#define fnmatch(x,y,z) strcmp(x,y)
-#endif
-
 static const char* comprlevel[] = {
     "stored",   "shrunk",   "redu:1",   "redu:2",   "redu:3",   "redu:4",
     "impl:N",   "toknze",   "defl:N",   "defl:B",   "impl:B" };
diff --git a/bins/unzzipdir-mem.c b/bins/unzzipdir-mem.c
index 79d6491..62eae42 100644
--- a/bins/unzzipdir-mem.c
+++ b/bins/unzzipdir-mem.c
@@ -7,6 +7,7 @@
 
 #include <zzip/memdisk.h>
 #include <zzip/__debug.h>
+#include <zzip/__fnmatch.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -20,12 +21,6 @@
 #include <io.h>
 #endif
 
-#ifdef ZZIP_HAVE_FNMATCH_H
-#include <fnmatch.h>
-#else
-#define fnmatch(x,y,z) strcmp(x,y)
-#endif
-
 static const char* comprlevel[] = {
     "stored",   "shrunk",   "redu:1",   "redu:2",   "redu:3",   "redu:4",
     "impl:N",   "toknze",   "defl:N",   "defl:B",   "impl:B" };
@@ -105,7 +100,7 @@ unzzip_list (int argc, char ** argv, int verbose)
 	    for (argn=1; argn < argc; argn++)
 	    {
 		if (! fnmatch (argv[argn], name, 
-			       FNM_NOESCAPE|FNM_PATHNAME|FNM_PERIOD))
+			       _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 3caa481..60b4428 100644
--- a/bins/unzzipdir-mix.c
+++ b/bins/unzzipdir-mix.c
@@ -7,6 +7,7 @@
 
 #include <zzip/lib.h>
 #include <zzip/__debug.h>
+#include <zzip/__fnmatch.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -20,12 +21,6 @@
 #include <io.h>
 #endif
 
-#ifdef ZZIP_HAVE_FNMATCH_H
-#include <fnmatch.h>
-#else
-#define fnmatch(x,y,z) strcmp(x,y)
-#endif
-
 static const char* comprlevel[] = {
     "stored",   "shrunk",   "redu:1",   "redu:2",   "redu:3",   "redu:4",
     "impl:N",   "toknze",   "defl:N",   "defl:B",   "impl:B" };
@@ -108,7 +103,7 @@ unzzip_list (int argc, char ** argv, int verbose)
 	    for (argn=1; argn < argc; argn++)
 	    {
 		if (! fnmatch (argv[argn], name, 
-			       FNM_NOESCAPE|FNM_PATHNAME|FNM_PERIOD))
+			       _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 bfac833..ceea8bc 100644
--- a/bins/unzzipdir-zip.c
+++ b/bins/unzzipdir-zip.c
@@ -6,6 +6,7 @@
  */
 
 #include <zzip/lib.h>
+#include <zzip/__fnmatch.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -19,12 +20,6 @@
 #include <io.h>
 #endif
 
-#ifdef ZZIP_HAVE_FNMATCH_H
-#include <fnmatch.h>
-#else
-#define fnmatch(x,y,z) strcmp(x,y)
-#endif
-
 static const char* comprlevel[] = {
     "stored",   "shrunk",   "redu:1",   "redu:2",   "redu:3",   "redu:4",
     "impl:N",   "toknze",   "defl:N",   "defl:B",   "impl:B" };
@@ -106,7 +101,7 @@ unzzip_list (int argc, char ** argv, int verbose)
 	    for (argn=1; argn < argc; argn++)
 	    {
 		if (! fnmatch (argv[argn], name, 
-			       FNM_NOESCAPE|FNM_PATHNAME|FNM_PERIOD))
+			       _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 c6b1334..1007838 100644
--- a/bins/unzzipshow.c
+++ b/bins/unzzipshow.c
@@ -6,15 +6,10 @@
  */
 
 #include <zzip/fseeko.h>
+#include <zzip/__fnmatch.h>
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef ZZIP_HAVE_FNMATCH_H
-#include <fnmatch.h>
-#else
-#define fnmatch(x,y,z) strcmp(x,y)
-#endif
-
 static const char usage[] = 
 {
     "unzzipshow <zip> [names].. \n"
@@ -99,7 +94,7 @@ main (int argc, char ** argv)
 	{
 	    char* name = zzip_entry_strdup_name (entry);
 	    if (! fnmatch (argv[argn], name, 
-			   FNM_NOESCAPE|FNM_PATHNAME|FNM_PERIOD))
+			   _zzip_FNM_NOESCAPE|_zzip_FNM_PATHNAME|_zzip_FNM_PERIOD))
 		zzip_cat_file (disk, name, stdout);
 	    free (name);
 	}
-- 
2.40.0