texlive[54012] Build/source/texk/xdvik: avoid strnlen

[commits+karl at tug.org]

Revision: 54012
          http://tug.org/svn/texlive?view=revision&revision=54012
Author:   karl
Date:     2020-03-02 22:25:51 +0100 (Mon, 02 Mar 2020)
Log Message:
-----------
avoid strnlen

Modified Paths:
--------------
    trunk/Build/source/texk/xdvik/ChangeLog
    trunk/Build/source/texk/xdvik/main.c

Modified: trunk/Build/source/texk/xdvik/ChangeLog
===================================================================
--- trunk/Build/source/texk/xdvik/ChangeLog	2020-03-02 19:43:27 UTC (rev 54011)
+++ trunk/Build/source/texk/xdvik/ChangeLog	2020-03-02 21:25:51 UTC (rev 54012)
@@ -1,3 +1,9 @@
+2020-03-02  Karl Berry  <karl at freefriends.org>
+
+	* main.c (is_good_dvi_file): avoid using strnlen, not present
+	on Solaris.
+	https://tug.org/pipermail/tlbuild/2020q1/004659.html
+
 2020-03-01  Karl Berry  <karl at freefriends.org>
 
 	* Import xdvi-22.87.04 from

Modified: trunk/Build/source/texk/xdvik/main.c
===================================================================
--- trunk/Build/source/texk/xdvik/main.c	2020-03-02 19:43:27 UTC (rev 54011)
+++ trunk/Build/source/texk/xdvik/main.c	2020-03-02 21:25:51 UTC (rev 54012)
@@ -455,7 +455,10 @@
 
     if ((ret = REALPATH(real_filename, canonical_path)) == NULL) {
 	/* REALPATH failed, use real_filename */
-	size_t n = strnlen(real_filename, MAXPATHLEN);
+	size_t n = strlen(real_filename);
+	if (n >= MAXPATHLEN) {
+	  n = MAXPATHLEN;
+	}
 
 	memcpy(canonical_path, real_filename, n);
 	canonical_path[n] = '\0';