From e29d3b031826e3682366db40ac72db2b65c70673 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 28 Jul 2011 15:10:43 +0000 Subject: kpathsea: More changes to reduce diffs with W32TeX git-svn-id: svn://tug.org/texlive/trunk@23257 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/db.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'Build/source/texk/kpathsea/db.c') diff --git a/Build/source/texk/kpathsea/db.c b/Build/source/texk/kpathsea/db.c index 86ac3786875..2e8aeef78c4 100644 --- a/Build/source/texk/kpathsea/db.c +++ b/Build/source/texk/kpathsea/db.c @@ -44,18 +44,13 @@ #endif /* read ls-R only on WIN32 */ -#ifdef WIN32 -static const_string db_names[] = { - DB_NAME, - NULL -}; -#else static const_string db_names[] = { DB_NAME, +#ifndef WIN32 DB_NAME_LC, +#endif NULL }; -#endif #ifndef ALIAS_NAME #define ALIAS_NAME "aliases" @@ -74,9 +69,17 @@ ignore_dir_p (const_string dirname) { const_string dot_pos = dirname; +#if defined(WIN32) + while (*(++dot_pos)) { + if (IS_KANJI(dot_pos-1)) + dot_pos++; + else if (*dot_pos == '.' && +#else while ((dot_pos = strchr (dot_pos + 1, '.'))) { + if ( +#endif /* If / before and no / after, skip it. */ - if (IS_DIR_SEP (dot_pos[-1]) && dot_pos[1] && !IS_DIR_SEP (dot_pos[1])) + IS_DIR_SEP (dot_pos[-1]) && dot_pos[1] && !IS_DIR_SEP (dot_pos[1])) return true; } -- cgit v1.2.3