diff options
| author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2014-01-25 13:18:06 +0000 |
|---|---|---|
| committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2014-01-25 13:18:06 +0000 |
| commit | ca3052a995aa72637d7cc9132e4ba1d2f6f3b8a5 (patch) | |
| tree | e5bf4561bc12bda36afc63c5d31fa8711d128fb9 | |
| parent | 1e27143dd80301d269c6d91737cb8c877fde6019 (diff) | |
[WIN32 only] progname should be kpse->program_name since progname can be NULL
git-svn-id: svn://tug.org/texlive/trunk@32785 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/kpathsea/kpsewhich.c | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 0e71b8f5726..20ea2e6aca4 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,8 @@ +2014-01-25 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * kpsewhich.c : [WIN32 only] progname should be kpse->program_name + since progname can be NULL. + 2014-01-25 Peter Breitenlohner <peb@mppmu.mpg.de> * knj.c: Drop unused variable (avoid warning). diff --git a/Build/source/texk/kpathsea/kpsewhich.c b/Build/source/texk/kpathsea/kpsewhich.c index 59739e56c9c..6ed65975bf7 100644 --- a/Build/source/texk/kpathsea/kpsewhich.c +++ b/Build/source/texk/kpathsea/kpsewhich.c @@ -690,11 +690,11 @@ main (int argc, string *argv) kpathsea_set_program_name (kpse, argv[0], progname); #ifdef WIN32 - if(strstr(progname,"xetex") || strstr(progname,"xelatex") - || strstr(progname,"uptex") || strstr(progname,"uplatex") - || strstr(progname,"dvipdfm") || strstr(progname,"extractbb") - || strstr(progname,"xbb") || strstr(progname,"ebb") - || strstr(progname,"dvips")) + if(strstr(kpse->program_name,"xetex") || strstr(kpse->program_name,"xelatex") + || strstr(kpse->program_name,"uptex") || strstr(kpse->program_name,"uplatex") + || strstr(kpse->program_name,"dvipdfm") || strstr(kpse->program_name,"extractbb") + || strstr(kpse->program_name,"xbb") || strstr(kpse->program_name,"ebb") + || strstr(kpse->program_name,"dvips")) { enc = kpathsea_var_value (kpse, "command_line_encoding"); if (get_command_line_args_utf8(enc, &ac, &av)) { |