summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorTakuji Tanaka <KXD02663@nifty.ne.jp>2014-01-07 15:22:29 +0000
committerTakuji Tanaka <KXD02663@nifty.ne.jp>2014-01-07 15:22:29 +0000
commit79b68a754e61b4825c185082d15b0e334440fbde (patch)
tree215eb87c7adf2d514e2dc67b8e50d2dc783117a5 /Build
parente083bdf89d31440fee7384cae4a11bc22812ba39 (diff)
kpathsea [WIN32]: Allow encoding name "" for non-utf8 command line
git-svn-id: svn://tug.org/texlive/trunk@32598 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog5
-rw-r--r--Build/source/texk/kpathsea/knj.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index df7baac43d1..bc54d08172d 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-08 TANAKA Takuji <KXD02663@nifty.ne.jp>
+
+ * knj.c: Allow encoding name "" for non-utf8 command line.
+ Warn if unknown encoding. (Windows only)
+
2014-01-04 Peter Breitenlohner <peb@mppmu.mpg.de>
* knj.c: Keep non-utf8 command line. Avoid compiler warnings.
diff --git a/Build/source/texk/kpathsea/knj.c b/Build/source/texk/kpathsea/knj.c
index 8cb5ff54817..b6112ed6258 100644
--- a/Build/source/texk/kpathsea/knj.c
+++ b/Build/source/texk/kpathsea/knj.c
@@ -169,7 +169,8 @@ get_command_line_args_utf8 (const_string enc, int *p_ac, char ***p_av)
int argc;
string *argv;
- if (!enc) return;
+ if (!enc || !strncmp(enc,"",1)) return;
+
#ifdef DEBUG
fprintf(stderr, "command_line_encoding (%s)\n", enc);
#endif /* DEBUG */
@@ -199,5 +200,7 @@ get_command_line_args_utf8 (const_string enc, int *p_ac, char ***p_av)
argv[argcw] = NULL;
*p_ac = argc;
*p_av = argv;
+ } else {
+ WARNING1("kpathsea: Ignoring unknown encoding `%s'", enc);
}
}