use 'zzip/__fnmatch.h' defines #6

diff --git a/bins/unzip-mem.c b/bins/unzip-mem.c
index b20bf37d6c577c943948d2e90db494b16947d7eb..c45cb72b835daa920f725725b642c46a758e74f4 100644 (file)
--- 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 7ab6bad9b15f819717600bd1197d06500121c196..982d262dbe83b1a39ed5552451e041c5cc574596 100644 (file)
--- 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 13cca3aaf7b7f49fb1f898fb3ac23a4f782d545d..d13029c269fb2b48bac7389c6a355e26baf8fd5f 100644 (file)
--- 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 aa9b86c4915d61b14093606dd52b3e54f410817f..91c2f009c0fc9fa29487d9e910199fcfb3994698 100644 (file)
--- 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 216be41ee2962c8550707285e89ad59eee8f3a3b..2810f85a42ba948f4c157210b648b9626e244e86 100644 (file)
--- 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 e35648ac21ee0556bec49ec124b01b169213610c..7b66875d115f6b0d96958500ddfb768baf6b79d1 100644 (file)
--- 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 79d64911844fa1c1f291ac6a8bfc2c782674414b..62eae42bc7adc730311a9c3e7a6768aaccf7e368 100644 (file)
--- 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 3caa4810b69972b8677b54dd97fb395e5b6a7d99..60b4428430db0b97f47fa889aeffed1c2c3d4598 100644 (file)
--- 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 bfac833483738630c26fc9467976339f8521bf05..ceea8bce608700792163f6bc4c626019dae72c04 100644 (file)
--- 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 c6b1334350fd0e5b6d53f76711de05631b74b69f..1007838f11374b40e5fa604bd0f6723de2bab66a 100644 (file)
--- 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);
        }