summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/lib/openclose.c
diff options
context:
space:
mode:
authorTakuji Tanaka <KXD02663@nifty.ne.jp>2018-06-09 11:10:16 +0000
committerTakuji Tanaka <KXD02663@nifty.ne.jp>2018-06-09 11:10:16 +0000
commite8c5e48f98b3d80faa21f5bf0f1c60c220b3d9cf (patch)
tree755f76e5c2caf0c497a4f27e229efedcf49f06b3 /Build/source/texk/web2c/lib/openclose.c
parenteb3ae6b768a053e55702f903f645be44f6ce7873 (diff)
pTeX: Support UTF-8 file names on UTF-8 locale (Unix-like platform only)
git-svn-id: svn://tug.org/texlive/trunk@47967 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/lib/openclose.c')
-rw-r--r--Build/source/texk/web2c/lib/openclose.c66
1 files changed, 56 insertions, 10 deletions
diff --git a/Build/source/texk/web2c/lib/openclose.c b/Build/source/texk/web2c/lib/openclose.c
index 57c4db9aae7..f39c3758d2c 100644
--- a/Build/source/texk/web2c/lib/openclose.c
+++ b/Build/source/texk/web2c/lib/openclose.c
@@ -150,6 +150,9 @@ boolean
open_input (FILE **f_ptr, int filefmt, const_string fopen_mode)
{
string fname = NULL;
+#if defined(PTEX) && !defined(WIN32)
+ string fname0;
+#endif
#ifdef FUNNY_CORE_DUMP
/* This only applies if a preloaded TeX/Metafont is being made;
it allows automatic creation of the core dump (typing ^\ loses
@@ -170,6 +173,17 @@ open_input (FILE **f_ptr, int filefmt, const_string fopen_mode)
absolute. This is because .aux and other such files will get
written to the output directory, and we have to be able to read
them from there. We only look for the name as-is. */
+
+#if defined(PTEX) && !defined(WIN32)
+ fname0 = ptenc_from_internal_enc_string_to_utf8(nameoffile + 1);
+ if (fname0) {
+ free (nameoffile);
+ namelength = strlen (fname0);
+ nameoffile = xmalloc (namelength + 2);
+ strcpy (nameoffile + 1, fname0);
+ free (fname0);
+ }
+#endif
if (output_directory && !kpse_absolute_p (nameoffile+1, false)) {
fname = concat3 (output_directory, DIR_SEP_STRING, nameoffile + 1);
*f_ptr = fopen (fname, fopen_mode);
@@ -183,6 +197,13 @@ open_input (FILE **f_ptr, int filefmt, const_string fopen_mode)
}
#endif
if (*f_ptr) {
+#if defined(PTEX) && !defined(WIN32)
+ fname0 = ptenc_from_utf8_string_to_internal_enc(fname);
+ if (fname0) {
+ free (fname);
+ fname = fname0;
+ }
+#endif
free (nameoffile);
namelength = strlen (fname);
nameoffile = xmalloc (namelength + 2);
@@ -205,7 +226,8 @@ open_input (FILE **f_ptr, int filefmt, const_string fopen_mode)
which we set `tex_input_type' to 0 in the change file. */
/* According to the pdfTeX people, pounding the disk for .vf files
is overkill as well. A more general solution would be nice. */
- boolean must_exist = (filefmt != kpse_tex_format || texinputtype)
+ boolean must_exist;
+ must_exist = (filefmt != kpse_tex_format || texinputtype)
&& (filefmt != kpse_vf_format);
fname = kpse_find_file (nameoffile + 1,
(kpse_file_format_type)filefmt,
@@ -229,21 +251,28 @@ open_input (FILE **f_ptr, int filefmt, const_string fopen_mode)
fname[i] = 0;
}
- /* kpse_find_file always returns a new string. */
- free (nameoffile);
- namelength = strlen (fname);
- nameoffile = xmalloc (namelength + 2);
- strcpy (nameoffile + 1, fname);
- free (fname);
-
/* This fopen is not allowed to fail. */
#if defined(PTEX) && !defined(WIN32)
if (filefmt == kpse_tex_format ||
filefmt == kpse_bib_format) {
- *f_ptr = nkf_open (nameoffile + 1, fopen_mode);
+ *f_ptr = nkf_open (fname, fopen_mode);
} else
#endif
- *f_ptr = xfopen (nameoffile + 1, fopen_mode);
+ *f_ptr = xfopen (fname, fopen_mode);
+
+ /* kpse_find_file always returns a new string. */
+#if defined(PTEX) && !defined(WIN32)
+ fname0 = ptenc_from_utf8_string_to_internal_enc(fname);
+ if (fname0) {
+ free (fname);
+ fname = fname0;
+ }
+#endif
+ free (nameoffile);
+ namelength = strlen (fname);
+ nameoffile = xmalloc (namelength + 2);
+ strcpy (nameoffile + 1, fname);
+ free (fname);
}
}
}
@@ -281,6 +310,9 @@ boolean
open_output (FILE **f_ptr, const_string fopen_mode)
{
string fname;
+#if defined(PTEX) && !defined(WIN32)
+ string fname0;
+#endif
boolean absolute = kpse_absolute_p(nameoffile+1, false);
/* If we have an explicit output directory, use it. */
@@ -289,6 +321,13 @@ open_output (FILE **f_ptr, const_string fopen_mode)
} else {
fname = nameoffile + 1;
}
+#if defined(PTEX) && !defined(WIN32)
+ fname0 = ptenc_from_internal_enc_string_to_utf8(fname);
+ if (fname0) {
+ free(fname);
+ fname = fname0;
+ }
+#endif
/* Is the filename openable as given? */
*f_ptr = fopen (fname, fopen_mode);
@@ -307,6 +346,13 @@ open_output (FILE **f_ptr, const_string fopen_mode)
/* If this succeeded, change nameoffile accordingly. */
if (*f_ptr) {
if (fname != nameoffile + 1) {
+#if defined(PTEX) && !defined(WIN32)
+ fname0 = ptenc_from_utf8_string_to_internal_enc(fname);
+ if (fname0) {
+ free(fname);
+ fname = fname0;
+ }
+#endif
free (nameoffile);
namelength = strlen (fname);
nameoffile = xmalloc (namelength + 2);