summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-12-05 01:55:44 +0000
committerKarl Berry <karl@freefriends.org>2009-12-05 01:55:44 +0000
commit2bc6c916479d1a8e53dd74e7b50ed0617064ed64 (patch)
tree6951d13606207277f515efeeefb435cda5db2466 /Build
parenta606ee5f0a39156b13a0ea31c921697660c88e8c (diff)
do not respect MKTEX* envvars/cnf values in kpsewhich
git-svn-id: svn://tug.org/texlive/trunk@16299 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog7
-rw-r--r--Build/source/texk/kpathsea/kpsewhich.c48
2 files changed, 42 insertions, 13 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 5eab68872f3..28e40bcabb4 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-05 Karl Berry <karl@tug.org>
+
+ * kpsewhich.c (init_more): split out lengthier initializations
+ to own fn. Initialize all mktex programs to false, so that
+ cnf/env settings such as MKTEXPK=1 don't apply to kpsewhich.
+ Suggested by Daniel Luecking, 16 Nov 2009 11:58:00.
+
2009-12-04 Karl Berry <karl@tug.org>
* tex-file.c (kpathsea_name_ok): not_ok if /..foobar.
diff --git a/Build/source/texk/kpathsea/kpsewhich.c b/Build/source/texk/kpathsea/kpsewhich.c
index 3c6f83fdd3a..f17060dd39a 100644
--- a/Build/source/texk/kpathsea/kpsewhich.c
+++ b/Build/source/texk/kpathsea/kpsewhich.c
@@ -257,7 +257,7 @@ lookup (kpathsea kpse, string name)
} else {
/* No user-specified search path, check user format or guess from NAME. */
- kpse_file_format_type fmt = find_format (kpse, name, true);
+ kpse_file_format_type fmt = find_format (kpse, name, true);
switch (fmt) {
case kpse_pk_format:
@@ -499,24 +499,29 @@ There is NO WARRANTY, to the extent permitted by law.\n");
exit (1);
}
}
-
-int
-main (int argc, string *argv)
-{
- unsigned unfound = 0;
- kpathsea kpse = kpathsea_new();
-
- /* Read options. */
- read_command_line (kpse, argc, argv);
- /* Initializations that may depend on the options. */
- /* kpathsea_maketex_option (kpse, "pk", false); */
- kpathsea_set_program_name (kpse, argv[0], progname);
+
+/* Initializations that may depend on the options. */
+static void
+init_more (kpathsea kpse)
+{
if (engine)
kpathsea_xputenv (kpse, "engine", engine);
+ /* Disable all mktex programs unless they were explicitly enabled on our
+ command line. */
+#define DISABLE_MKTEX(fmt) \
+kpathsea_set_program_enabled (kpse, fmt, false, kpse_src_cmdline - 1)
+ DISABLE_MKTEX (kpse_pk_format);
+ DISABLE_MKTEX (kpse_mf_format);
+ DISABLE_MKTEX (kpse_tex_format);
+ DISABLE_MKTEX (kpse_tfm_format);
+ DISABLE_MKTEX (kpse_fmt_format);
+ DISABLE_MKTEX (kpse_ofm_format);
+ DISABLE_MKTEX (kpse_ocp_format);
+
/* NULL for no fallback font. */
kpathsea_init_prog (kpse, uppercasify (kpse->program_name), dpi, mode, NULL);
@@ -528,8 +533,23 @@ main (int argc, string *argv)
user_format_string);
}
}
+}
+
+
+
+int
+main (int argc, string *argv)
+{
+ unsigned unfound = 0;
+ kpathsea kpse = kpathsea_new();
+ /* Read options, then dependent initializations. */
+ read_command_line (kpse, argc, argv);
+
+ kpathsea_set_program_name (kpse, argv[0], progname);
+ init_more (kpse);
+
/* Perform actions. */
/* Variable expansion. */
@@ -571,6 +591,7 @@ main (int argc, string *argv)
show_all = 1;
}
+ /* Usual case: look up each given filename. */
for (; optind < argc; optind++) {
unfound += lookup (kpse, argv[optind]);
}
@@ -584,6 +605,7 @@ main (int argc, string *argv)
free (name);
}
}
+
kpathsea_finish (kpse);
return unfound > 255 ? 1 : unfound;
}