diff options
Diffstat (limited to 'Build/source/texk/kpathsea/xdirname.c')
-rw-r--r-- | Build/source/texk/kpathsea/xdirname.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Build/source/texk/kpathsea/xdirname.c b/Build/source/texk/kpathsea/xdirname.c index c5b38bae891..0aab9b4b001 100644 --- a/Build/source/texk/kpathsea/xdirname.c +++ b/Build/source/texk/kpathsea/xdirname.c @@ -1,6 +1,6 @@ /* xdirname.c: return the directory part of a path. - Copyright 1999, 2008, 2011 Karl Berry. + Copyright 1999, 2008, 2011, 2016 Karl Berry. Copyright 2005 Olaf Weber. This library is free software; you can redistribute it and/or @@ -43,13 +43,13 @@ xdirname (const_string name) limit = 2; } else if (IS_UNC_NAME(name)) { for (limit = 2; name[limit] && !IS_DIR_SEP (name[limit]); limit++) -#if defined(WIN32) +#if defined(WIN32) && defined(KPSE_COMPAT_API) if (IS_KANJI(name+limit)) limit++ #endif ; if (name[limit++] && name[limit] && !IS_DIR_SEP (name[limit])) { for (; name[limit] && !IS_DIR_SEP (name[limit]); limit++) -#if defined(WIN32) +#if defined(WIN32) && defined(KPSE_COMPAT_API) if (IS_KANJI(name+limit)) limit++ #endif ; @@ -68,7 +68,10 @@ xdirname (const_string name) for (i++; IS_DIR_SEP (name[i]); i++) ; loc = i + 1; - } else if (IS_KANJI(name+i)) i++; + } +#if defined (KPSE_COMPAT_API) + else if (IS_KANJI(name+i)) i++; +#endif } #else for (loc = strlen (name); loc > limit && !IS_DIR_SEP (name[loc-1]); loc--) @@ -107,8 +110,10 @@ xdirname (const_string name) for (p = ret; *p; p++) { if (*p == '\\') *p = '/'; +#if defined (KPSE_COMPAT_API) else if (IS_KANJI(p)) p++; +#endif } #endif |