texlive[46771] Build/source/libs/zziplib: Use my_strnlen in all

[commits+kakuto at tug.org]

Revision: 46771
          http://tug.org/svn/texlive?view=revision&revision=46771
Author:   kakuto
Date:     2018-03-01 04:23:16 +0100 (Thu, 01 Mar 2018)
Log Message:
-----------
Use my_strnlen in all platforms without strndup, since we use strndup only in zziplib.test

Modified Paths:
--------------
    trunk/Build/source/libs/zziplib/TLpatches/ChangeLog
    trunk/Build/source/libs/zziplib/zziplib-src/zzip/__string.h

Added Paths:
-----------
    trunk/Build/source/libs/zziplib/TLpatches/patch-04-strnlen

Removed Paths:
-------------
    trunk/Build/source/libs/zziplib/TLpatches/patch-04-solaris-strnlen

Modified: trunk/Build/source/libs/zziplib/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/libs/zziplib/TLpatches/ChangeLog	2018-03-01 01:23:17 UTC (rev 46770)
+++ trunk/Build/source/libs/zziplib/TLpatches/ChangeLog	2018-03-01 03:23:16 UTC (rev 46771)
@@ -1,6 +1,6 @@
-2018-02-28  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+2018-03-01  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
-	* patch-04-solaris-strnlen: Add to support old solaris.
+	* patch-04-strnlen: Add for platforms without strnlen.
 
 2018-02-06  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 

Deleted: trunk/Build/source/libs/zziplib/TLpatches/patch-04-solaris-strnlen
===================================================================
--- trunk/Build/source/libs/zziplib/TLpatches/patch-04-solaris-strnlen	2018-03-01 01:23:17 UTC (rev 46770)
+++ trunk/Build/source/libs/zziplib/TLpatches/patch-04-solaris-strnlen	2018-03-01 03:23:16 UTC (rev 46771)
@@ -1,22 +0,0 @@
-diff -ur zziplib-0.13.68.orig/zzip/__string.h zziplib-0.13.68/zzip/__string.h
---- zziplib-0.13.68.orig/zzip/__string.h	Tue Feb 06 05:00:56 2018
-+++ zziplib-0.13.68/zzip/__string.h	Wed Feb 28 08:54:17 2018
-@@ -18,6 +18,18 @@
- #define _zzip_strndup strndup
- #else
- 
-+#if defined(sun) || defined(__sun)
-+static size_t  my_strnlen(const char*  str, size_t  maxlen)
-+{
-+    char *p = memchr(str, 0, maxlen);
-+    if (p == NULL)
-+       return maxlen;
-+    else
-+       return (p - str);
-+}
-+#define strnlen(x,y) my_strnlen((x),(y))
-+#endif /* sun || __sun */
-+
- /* if your system does not have strndup: */
- zzip__new__ static char *
- _zzip_strndup(char const *p, size_t maxlen)

Added: trunk/Build/source/libs/zziplib/TLpatches/patch-04-strnlen
===================================================================
--- trunk/Build/source/libs/zziplib/TLpatches/patch-04-strnlen	                        (rev 0)
+++ trunk/Build/source/libs/zziplib/TLpatches/patch-04-strnlen	2018-03-01 03:23:16 UTC (rev 46771)
@@ -0,0 +1,20 @@
+diff -ur zziplib-0.13.68.orig/zzip/__string.h zziplib-0.13.68/zzip/__string.h
+--- zziplib-0.13.68.orig/zzip/__string.h	Tue Feb 06 05:00:56 2018
++++ zziplib-0.13.68/zzip/__string.h	Thu Mar 01 12:13:00 2018
+@@ -18,6 +18,16 @@
+ #define _zzip_strndup strndup
+ #else
+ 
++static size_t  my_strnlen(const char*  str, size_t  maxlen)
++{
++    char *p = memchr(str, 0, maxlen);
++    if (p == NULL)
++       return maxlen;
++    else
++       return (p - str);
++}
++#define strnlen(x,y) my_strnlen((x),(y))
++
+ /* if your system does not have strndup: */
+ zzip__new__ static char *
+ _zzip_strndup(char const *p, size_t maxlen)

Modified: trunk/Build/source/libs/zziplib/zziplib-src/zzip/__string.h
===================================================================
--- trunk/Build/source/libs/zziplib/zziplib-src/zzip/__string.h	2018-03-01 01:23:17 UTC (rev 46770)
+++ trunk/Build/source/libs/zziplib/zziplib-src/zzip/__string.h	2018-03-01 03:23:16 UTC (rev 46771)
@@ -18,7 +18,6 @@
 #define _zzip_strndup strndup
 #else
 
-#if defined(sun) || defined(__sun)
 static size_t  my_strnlen(const char*  str, size_t  maxlen)
 {
     char *p = memchr(str, 0, maxlen);
@@ -28,7 +27,6 @@
        return (p - str);
 }
 #define strnlen(x,y) my_strnlen((x),(y))
-#endif /* sun || __sun */
 
 /* if your system does not have strndup: */
 zzip__new__ static char *