texlive[42489] Build/source/texk/mendexk: mendexk: discard the

[commits+kakuto at tug.org]

Revision: 42489
          http://tug.org/svn/texlive?view=revision&revision=42489
Author:   kakuto
Date:     2016-11-12 10:31:11 +0100 (Sat, 12 Nov 2016)
Log Message:
-----------
mendexk: discard the previous change to avoid access violation

Modified Paths:
--------------
    trunk/Build/source/texk/mendexk/ChangeLog
    trunk/Build/source/texk/mendexk/mendex.h
    trunk/Build/source/texk/mendexk/styfile.c

Modified: trunk/Build/source/texk/mendexk/ChangeLog
===================================================================
--- trunk/Build/source/texk/mendexk/ChangeLog	2016-11-12 02:19:09 UTC (rev 42488)
+++ trunk/Build/source/texk/mendexk/ChangeLog	2016-11-12 09:31:11 UTC (rev 42489)
@@ -1,3 +1,9 @@
+2016-11-12  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* mendex.h: Sync with W32TeX (W32 only).
+	* styfile.c: Revert. Use fgets() instead of mfgets() in bfgets()
+	to avoid access violation.
+
 2016-09-28  Hironobu Yamashita  <h.y.acetaminophen at gmail.com>
 
 	* styfile.c: Use mfgets() instead of fgets() in bfgets().

Modified: trunk/Build/source/texk/mendexk/mendex.h
===================================================================
--- trunk/Build/source/texk/mendexk/mendex.h	2016-11-12 02:19:09 UTC (rev 42488)
+++ trunk/Build/source/texk/mendexk/mendex.h	2016-11-12 09:31:11 UTC (rev 42489)
@@ -8,7 +8,7 @@
 
 #ifdef WIN32
 #define nkf_open fopen
-#define nkf_close fclose
+#define nkf_close(fp) {clear_infile_enc(fp); fclose(fp);}
 #endif
 
 struct page {

Modified: trunk/Build/source/texk/mendexk/styfile.c
===================================================================
--- trunk/Build/source/texk/mendexk/styfile.c	2016-11-12 02:19:09 UTC (rev 42488)
+++ trunk/Build/source/texk/mendexk/styfile.c	2016-11-12 09:31:11 UTC (rev 42489)
@@ -21,7 +21,7 @@
 bfgets (char *buf, int size, FILE *fp)
 {
 	char *p, *q;
-	p = mfgets (buf, size, fp);
+	p = fgets (buf, size, fp);
 	for (q = buf; *q; q++) {
 		if(*q == '\r') {
 			*q++ = '\n';