summaryrefslogtreecommitdiff
path: root/Build/source/texk/mendexk
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-11-12 09:31:11 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-11-12 09:31:11 +0000
commit1129993c8ce70ee984a6306b5e22972b82b063e2 (patch)
treeeb63a35df488d283b6984c4e88d90b0449fe2daf /Build/source/texk/mendexk
parent64979cb221c8d17dc133aa37d49fc20335185b92 (diff)
mendexk: discard the previous change to avoid access violation
git-svn-id: svn://tug.org/texlive/trunk@42489 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/mendexk')
-rw-r--r--Build/source/texk/mendexk/ChangeLog6
-rw-r--r--Build/source/texk/mendexk/mendex.h2
-rw-r--r--Build/source/texk/mendexk/styfile.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/Build/source/texk/mendexk/ChangeLog b/Build/source/texk/mendexk/ChangeLog
index d1a9abb2940..9d8cb48640a 100644
--- a/Build/source/texk/mendexk/ChangeLog
+++ b/Build/source/texk/mendexk/ChangeLog
@@ -1,3 +1,9 @@
+2016-11-12 Akira Kakuto <kakuto@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@gmail.com>
* styfile.c: Use mfgets() instead of fgets() in bfgets().
diff --git a/Build/source/texk/mendexk/mendex.h b/Build/source/texk/mendexk/mendex.h
index c26472c4131..8f513b5cc25 100644
--- a/Build/source/texk/mendexk/mendex.h
+++ b/Build/source/texk/mendexk/mendex.h
@@ -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 {
diff --git a/Build/source/texk/mendexk/styfile.c b/Build/source/texk/mendexk/styfile.c
index e35256c2e29..04189664099 100644
--- a/Build/source/texk/mendexk/styfile.c
+++ b/Build/source/texk/mendexk/styfile.c
@@ -21,7 +21,7 @@ static char *
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';