diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-06-28 10:20:13 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-06-28 10:20:13 +0000 |
commit | ba2c33bcc94b39c1eabe62fee838173aa14e76c4 (patch) | |
tree | fb6cf347803b10bcf894aa69535dc0b2b60d6809 /Build/source/texk/kpathsea/elt-dirs.c | |
parent | f39500686f1d59c546088298de78c179dc55189e (diff) |
kpathsea: Eliminate global and static variables (w32 only)
git-svn-id: svn://tug.org/texlive/trunk@41557 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/kpathsea/elt-dirs.c')
-rw-r--r-- | Build/source/texk/kpathsea/elt-dirs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Build/source/texk/kpathsea/elt-dirs.c b/Build/source/texk/kpathsea/elt-dirs.c index 69544946928..93041142b10 100644 --- a/Build/source/texk/kpathsea/elt-dirs.c +++ b/Build/source/texk/kpathsea/elt-dirs.c @@ -1,6 +1,6 @@ /* elt-dirs.c: Translate a path element to its corresponding director{y,ies}. - Copyright 1993, 1994, 1995, 1996, 1997, 2008, 2009, 2010, 2011 Karl Berry. + Copyright 1993, 1994, 1995, 1996, 1997, 2008, 2009, 2010, 2011, 2016 Karl Berry. Copyright 1997, 1998, 1999, 2000, 2005 Olaf Weber. This library is free software; you can redistribute it and/or @@ -133,7 +133,7 @@ do_subdir (kpathsea kpse, str_llist_type *str_list_ptr, string elt, #if defined (WIN32) strcpy(dirname, FN_STRING(name)); strcat(dirname, "/*.*"); /* "*.*" or "*" -- seems equivalent. */ - get_wstring_from_fsyscp(dirname, dirnamew); + get_wstring_from_mbstring(kpse->File_system_codepage, dirname, dirnamew); hnd = FindFirstFileW(dirnamew, &find_file_data); if (hnd == INVALID_HANDLE_VALUE) { @@ -158,7 +158,7 @@ do_subdir (kpathsea kpse, str_llist_type *str_list_ptr, string elt, int links; /* Construct the potential subdirectory name. */ - potname = get_fsyscp_from_wstring(find_file_data.cFileName, potname=NULL); + potname = get_mbstring_from_wstring(kpse->File_system_codepage, find_file_data.cFileName, potname=NULL); fn_str_grow (&name, potname); free(potname); @@ -368,7 +368,7 @@ kpathsea_normalize_path (kpathsea kpse, string elt) for (i = 0; elt[i]; i++) { if (elt[i] == '\\') elt[i] = '/'; - else if (IS_KANJI(elt + i)) + else if (kpathsea_IS_KANJI(kpse, elt + i)) i++; } #endif |