diff options
author | Karl Berry <karl@freefriends.org> | 2009-12-14 01:15:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-12-14 01:15:01 +0000 |
commit | fe5f2880bf0497ad075041ccaa6b7a1f7e803cdd (patch) | |
tree | 1e1205d19be5d0eb8088bd6012ef0f3e20329e06 /Build | |
parent | 6741724c15fe73bba495c2dc243412f0704c270d (diff) |
rm special rearrangement of checking kpse_fmt_format last
git-svn-id: svn://tug.org/texlive/trunk@16396 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/kpsewhich.c | 16 |
2 files changed, 6 insertions, 16 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index ad4a2e9ad7b..77681015008 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,9 @@ +2009-12-14 Karl Berry <karl@tug.org> + + * kpsewhich.c (find_format): remove rearrangement of checking + kpse_fmt_format last, since it doesn't have any special extensions + now (what were they?). + 2009-12-11 Alexander Cherepanov <cherepan@mccme.ru> * tex-file.c (kpathsea_name_ok): correct check for /../ so that diff --git a/Build/source/texk/kpathsea/kpsewhich.c b/Build/source/texk/kpathsea/kpsewhich.c index e529cbc75fc..8a76c08400d 100644 --- a/Build/source/texk/kpathsea/kpsewhich.c +++ b/Build/source/texk/kpathsea/kpsewhich.c @@ -155,24 +155,8 @@ find_format (kpathsea kpse, string name, boolean is_filename) if (found) break; - - /* Some trickery here: the extensions for kpse_fmt_format can - * clash with other extensions in use, and we prefer for those - * others to be preferred. And we don't want to change the - * integer value of kpse_fmt_format. So skip it when first - * enountered, then use it when we've done everything else, - * and use it as the end-guard. - */ - if (f == kpse_fmt_format) { - f = kpse_last_format; - } else if (++f == kpse_fmt_format) { - f++; - } else if (f == kpse_last_format) { - f = kpse_fmt_format; - } } - /* If there was a match, f will be one past the correct value. */ ret = f; } |