fix my mistakes in zziplib

git-svn-id: svn://tug.org/texlive/trunk@44657 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 17 insertions, 164 deletions

diff --git a/Build/source/libs/zziplib/TLpatches/patch-01-binary b/Build/source/libs/zziplib/TLpatches/patch-01-binary
index 518657f6493..cc2dad0ff3c 100644
--- a/Build/source/libs/zziplib/TLpatches/patch-01-binary
+++ b/Build/source/libs/zziplib/TLpatches/patch-01-binary
@@ -1,6 +1,6 @@
 diff -ur zziplib-0.13.66.orig/bins/unzip-mem.c zziplib-0.13.66/bins/unzip-mem.c
 --- zziplib-0.13.66.orig/bins/unzip-mem.c	Mon Apr 24 08:46:28 2017
-+++ zziplib-0.13.66/bins/unzip-mem.c	Wed May 24 21:13:24 2017
++++ zziplib-0.13.66/bins/unzip-mem.c	Wed Jun 21 07:29:46 2017
 @@ -100,7 +100,7 @@
  static void zzip_mem_entry_make(ZZIP_MEM_DISK* disk, 
  				ZZIP_MEM_ENTRY* entry)
@@ -12,30 +12,16 @@ diff -ur zziplib-0.13.66.orig/bins/unzip-mem.c zziplib-0.13.66/bins/unzip-mem.c
      if (status < EXIT_WARNINGS) status = EXIT_WARNINGS;
 diff -ur zziplib-0.13.66.orig/bins/unzzipcat-big.c zziplib-0.13.66/bins/unzzipcat-big.c
 --- zziplib-0.13.66.orig/bins/unzzipcat-big.c	Mon Apr 24 08:46:28 2017
-+++ zziplib-0.13.66/bins/unzzipcat-big.c	Wed May 24 21:13:24 2017
-@@ -62,6 +62,21 @@
++++ zziplib-0.13.66/bins/unzzipcat-big.c	Wed Jun 21 07:29:46 2017
+@@ -62,7 +62,6 @@
      }
  }
  
-+#if !defined(HAVE_STRNDUP)
-+static char *
-+strndup(char *p, size_t maxlen)
-+{
-+  char *r;
-+  if (!p)
-+    return 0;
-+  r = malloc(maxlen + 1);
-+  if (!r)
-+    return r;
-+  strncpy(r, p, maxlen);
-+  r[maxlen] = '\0';
-+  return r;
-+}
-+#endif
- 
+-
  static FILE* create_fopen(char* name, char* mode, int subdirs)
  {
-@@ -83,7 +98,7 @@
+    if (subdirs)
+@@ -83,7 +82,7 @@
      int argn;
      FILE* disk;
  
@@ -44,7 +30,7 @@ diff -ur zziplib-0.13.66.orig/bins/unzzipcat-big.c zziplib-0.13.66/bins/unzzipca
      if (! disk) {
  	perror(argv[1]);
  	return -1;
-@@ -96,7 +111,7 @@
+@@ -96,7 +95,7 @@
  	{
  	    char* name = zzip_entry_strdup_name (entry);
  	    FILE* out = stdout;
@@ -53,7 +39,7 @@ diff -ur zziplib-0.13.66.orig/bins/unzzipcat-big.c zziplib-0.13.66/bins/unzzipca
  	    unzzip_cat_file (disk, name, out);
  	    if (extract) fclose(out);
  	    free (name);
-@@ -125,7 +140,7 @@
+@@ -125,7 +124,7 @@
  			   FNM_NOESCAPE|FNM_PATHNAME|FNM_PERIOD))
  	    {
  	        FILE* out = stdout;
@@ -64,31 +50,8 @@ diff -ur zziplib-0.13.66.orig/bins/unzzipcat-big.c zziplib-0.13.66/bins/unzzipca
  		break; /* match loop */
 diff -ur zziplib-0.13.66.orig/bins/unzzipcat-mem.c zziplib-0.13.66/bins/unzzipcat-mem.c
 --- zziplib-0.13.66.orig/bins/unzzipcat-mem.c	Mon Apr 24 08:46:28 2017
-+++ zziplib-0.13.66/bins/unzzipcat-mem.c	Wed May 24 21:13:24 2017
-@@ -57,6 +57,22 @@
-     }
- }
- 
-+#if !defined(HAVE_STRNDUP)
-+static char *
-+strndup(char *p, size_t maxlen)
-+{
-+  char *r;
-+  if (!p)
-+    return 0;
-+  r = malloc(maxlen + 1);
-+  if (!r)
-+    return r;
-+  strncpy(r, p, maxlen);
-+  r[maxlen] = '\0';
-+  return r;
-+}
-+#endif
-+
- static FILE* create_fopen(char* name, char* mode, int subdirs)
- {
-    if (subdirs)
-@@ -97,7 +113,7 @@
++++ zziplib-0.13.66/bins/unzzipcat-mem.c	Wed Jun 21 07:29:46 2017
+@@ -97,7 +97,7 @@
  	{
  	    char* name = zzip_mem_entry_to_name (entry);
  	    FILE* out = stdout;
@@ -97,7 +60,7 @@ diff -ur zziplib-0.13.66.orig/bins/unzzipcat-mem.c zziplib-0.13.66/bins/unzzipca
  	    unzzip_mem_disk_cat_file (disk, name, out);
  	    if (extract) fclose(out);
  	}
-@@ -125,7 +141,7 @@
+@@ -125,7 +125,7 @@
  			   FNM_NOESCAPE|FNM_PATHNAME|FNM_PERIOD))
  	    {
  	        FILE* out = stdout;
@@ -108,7 +71,7 @@ diff -ur zziplib-0.13.66.orig/bins/unzzipcat-mem.c zziplib-0.13.66/bins/unzzipca
  		break; /* match loop */
 diff -ur zziplib-0.13.66.orig/bins/unzzipcat-mix.c zziplib-0.13.66/bins/unzzipcat-mix.c
 --- zziplib-0.13.66.orig/bins/unzzipcat-mix.c	Mon Apr 24 08:46:28 2017
-+++ zziplib-0.13.66/bins/unzzipcat-mix.c	Wed May 24 21:13:24 2017
++++ zziplib-0.13.66/bins/unzzipcat-mix.c	Wed Jun 21 07:29:46 2017
 @@ -30,7 +30,7 @@
  
  static void unzzip_cat_file(ZZIP_DIR* disk, char* name, FILE* out)
@@ -118,30 +81,7 @@ diff -ur zziplib-0.13.66.orig/bins/unzzipcat-mix.c zziplib-0.13.66/bins/unzzipca
      if (file) 
      {
  	char buffer[1024]; int len;
-@@ -43,6 +43,22 @@
-     }
- }
- 
-+#if !defined(HAVE_STRNDUP)
-+static char *
-+strndup(char *p, size_t maxlen)
-+{
-+  char *r;
-+  if (!p)
-+    return 0;
-+  r = malloc(maxlen + 1);
-+  if (!r)
-+    return r;
-+  strncpy(r, p, maxlen);
-+  r[maxlen] = '\0';
-+  return r;
-+}
-+#endif
-+
- static FILE* create_fopen(char* name, char* mode, int subdirs)
- {
-    if (subdirs)
-@@ -82,7 +98,7 @@
+@@ -82,7 +82,7 @@
  	{
  	    char* name = entry->d_name;
  	    FILE* out = stdout;
@@ -150,7 +90,7 @@ diff -ur zziplib-0.13.66.orig/bins/unzzipcat-mix.c zziplib-0.13.66/bins/unzzipca
  	    unzzip_cat_file (disk, name, out);
  	    if (extract) fclose(out);
  	}
-@@ -108,7 +124,7 @@
+@@ -108,7 +108,7 @@
  	             memcpy(mix_name, zip_name, zip_name_len);
  	             mix_name[zip_name_len] = '/';
  	             strcpy(mix_name + zip_name_len + 1, name);
@@ -161,31 +101,8 @@ diff -ur zziplib-0.13.66.orig/bins/unzzipcat-mix.c zziplib-0.13.66/bins/unzzipca
  		     unzzip_cat_file (disk, mix_name, out);
 diff -ur zziplib-0.13.66.orig/bins/unzzipcat-zip.c zziplib-0.13.66/bins/unzzipcat-zip.c
 --- zziplib-0.13.66.orig/bins/unzzipcat-zip.c	Mon Apr 24 08:46:28 2017
-+++ zziplib-0.13.66/bins/unzzipcat-zip.c	Wed May 24 21:13:24 2017
-@@ -43,6 +43,22 @@
-     }
- }
- 
-+#if !defined(HAVE_STRNDUP)
-+static char *
-+strndup(char *p, size_t maxlen)
-+{
-+  char *r;
-+  if (!p)
-+    return 0;
-+  r = malloc(maxlen + 1);
-+  if (!r)
-+    return r;
-+  strncpy(r, p, maxlen);
-+  r[maxlen] = '\0';
-+  return r;
-+}
-+#endif
-+
- static FILE* create_fopen(char* name, char* mode, int subdirs)
- {
-    if (subdirs)
-@@ -83,7 +99,7 @@
++++ zziplib-0.13.66/bins/unzzipcat-zip.c	Wed Jun 21 07:29:46 2017
+@@ -83,7 +83,7 @@
  	{
  	    char* name = entry.d_name;
  	    FILE* out = stdout;
@@ -194,7 +111,7 @@ diff -ur zziplib-0.13.66.orig/bins/unzzipcat-zip.c zziplib-0.13.66/bins/unzzipca
  	    unzzip_cat_file (disk, name, out);
  	    if (extract) fclose(out);
  	}
-@@ -100,7 +116,7 @@
+@@ -100,7 +100,7 @@
  			       FNM_NOESCAPE|FNM_PATHNAME|FNM_PERIOD))
  	        {
  	             FILE* out = stdout;
diff --git a/Build/source/libs/zziplib/zziplib-src/bins/unzzipcat-big.c b/Build/source/libs/zziplib/zziplib-src/bins/unzzipcat-big.c
index c644bc48cfd..5868c4ec5ae 100644
--- a/Build/source/libs/zziplib/zziplib-src/bins/unzzipcat-big.c
+++ b/Build/source/libs/zziplib/zziplib-src/bins/unzzipcat-big.c
@@ -62,22 +62,6 @@ static void unzzip_cat_file(FILE* disk, char* name, FILE* out)
     }
 }
 
-#if !defined(HAVE_STRNDUP)
-static char *
-strndup(char *p, size_t maxlen)
-{
-  char *r;
-  if (!p)
-    return 0;
-  r = malloc(maxlen + 1);
-  if (!r)
-    return r;
-  strncpy(r, p, maxlen);
-  r[maxlen] = '\0';
-  return r;
-}
-#endif
-
 static FILE* create_fopen(char* name, char* mode, int subdirs)
 {
    if (subdirs)
diff --git a/Build/source/libs/zziplib/zziplib-src/bins/unzzipcat-mem.c b/Build/source/libs/zziplib/zziplib-src/bins/unzzipcat-mem.c
index 152c3d58de5..89d80c721cf 100644
--- a/Build/source/libs/zziplib/zziplib-src/bins/unzzipcat-mem.c
+++ b/Build/source/libs/zziplib/zziplib-src/bins/unzzipcat-mem.c
@@ -57,22 +57,6 @@ static void unzzip_mem_disk_cat_file(ZZIP_MEM_DISK* disk, char* name, FILE* out)
     }
 }
 
-#if !defined(HAVE_STRNDUP)
-static char *
-strndup(char *p, size_t maxlen)
-{
-  char *r;
-  if (!p)
-    return 0;
-  r = malloc(maxlen + 1);
-  if (!r)
-    return r;
-  strncpy(r, p, maxlen);
-  r[maxlen] = '\0';
-  return r;
-}
-#endif
-
 static FILE* create_fopen(char* name, char* mode, int subdirs)
 {
    if (subdirs)
diff --git a/Build/source/libs/zziplib/zziplib-src/bins/unzzipcat-mix.c b/Build/source/libs/zziplib/zziplib-src/bins/unzzipcat-mix.c
index 2aa4459d2c2..ee40b19c4a7 100644
--- a/Build/source/libs/zziplib/zziplib-src/bins/unzzipcat-mix.c
+++ b/Build/source/libs/zziplib/zziplib-src/bins/unzzipcat-mix.c
@@ -43,22 +43,6 @@ static void unzzip_cat_file(ZZIP_DIR* disk, char* name, FILE* out)
     }
 }
 
-#if !defined(HAVE_STRNDUP)
-static char *
-strndup(char *p, size_t maxlen)
-{
-  char *r;
-  if (!p)
-    return 0;
-  r = malloc(maxlen + 1);
-  if (!r)
-    return r;
-  strncpy(r, p, maxlen);
-  r[maxlen] = '\0';
-  return r;
-}
-#endif
-
 static FILE* create_fopen(char* name, char* mode, int subdirs)
 {
    if (subdirs)
diff --git a/Build/source/libs/zziplib/zziplib-src/bins/unzzipcat-zip.c b/Build/source/libs/zziplib/zziplib-src/bins/unzzipcat-zip.c
index c0d465e4e82..72d89cdb5d6 100644
--- a/Build/source/libs/zziplib/zziplib-src/bins/unzzipcat-zip.c
+++ b/Build/source/libs/zziplib/zziplib-src/bins/unzzipcat-zip.c
@@ -43,22 +43,6 @@ static void unzzip_cat_file(ZZIP_DIR* disk, char* name, FILE* out)
     }
 }
 
-#if !defined(HAVE_STRNDUP)
-static char *
-strndup(char *p, size_t maxlen)
-{
-  char *r;
-  if (!p)
-    return 0;
-  r = malloc(maxlen + 1);
-  if (!r)
-    return r;
-  strncpy(r, p, maxlen);
-  r[maxlen] = '\0';
-  return r;
-}
-#endif
-
 static FILE* create_fopen(char* name, char* mode, int subdirs)
 {
    if (subdirs)