texlive[46760] Build/source/libs/zziplib: zziplib: support old

[commits+kakuto at tug.org]

Revision: 46760
          http://tug.org/svn/texlive?view=revision&revision=46760
Author:   kakuto
Date:     2018-02-28 01:09:35 +0100 (Wed, 28 Feb 2018)
Log Message:
-----------
zziplib: support old solaris

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-solaris-strnlen

Modified: trunk/Build/source/libs/zziplib/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/libs/zziplib/TLpatches/ChangeLog	2018-02-27 23:14:55 UTC (rev 46759)
+++ trunk/Build/source/libs/zziplib/TLpatches/ChangeLog	2018-02-28 00:09:35 UTC (rev 46760)
@@ -1,3 +1,7 @@
+2018-02-28  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* patch-04-solaris-strnlen: Add to support old solaris.
+
 2018-02-06  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	* Import zziplib-0.13.68.

Added: trunk/Build/source/libs/zziplib/TLpatches/patch-04-solaris-strnlen
===================================================================
--- trunk/Build/source/libs/zziplib/TLpatches/patch-04-solaris-strnlen	                        (rev 0)
+++ trunk/Build/source/libs/zziplib/TLpatches/patch-04-solaris-strnlen	2018-02-28 00:09:35 UTC (rev 46760)
@@ -0,0 +1,22 @@
+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)

Modified: trunk/Build/source/libs/zziplib/zziplib-src/zzip/__string.h
===================================================================
--- trunk/Build/source/libs/zziplib/zziplib-src/zzip/__string.h	2018-02-27 23:14:55 UTC (rev 46759)
+++ trunk/Build/source/libs/zziplib/zziplib-src/zzip/__string.h	2018-02-28 00:09:35 UTC (rev 46760)
@@ -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)