summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-27 00:03:04 +0000
committerKarl Berry <karl@freefriends.org>2018-01-27 00:03:04 +0000
commitc113bb85d5ae6b1250a83b597cd1ed498359cd03 (patch)
treec2977fc7b5cbbfafd738b07754e5ed82652763bb /Build
parentdb529d53f555181f511d84209964103b16fb7965 (diff)
log newline before kpse_cnf_format dump, since this happens mid-search
git-svn-id: svn://tug.org/texlive/trunk@46449 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog5
-rw-r--r--Build/source/texk/kpathsea/tex-file.c96
2 files changed, 54 insertions, 47 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 95ffe9227d4..2a9eca19ab4 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-26 Karl Berry <karl@freefriends.org>
+
+ * tex-file.c (kpathsea_init_format_return_varlist): log a newline
+ before kpse_cnf_format, since this happens mid-search.
+
2018-01-25 Karl Berry <karl@freefriends.org>
* pathsearch.c: more consistent code formatting, doc fixes.
diff --git a/Build/source/texk/kpathsea/tex-file.c b/Build/source/texk/kpathsea/tex-file.c
index 952f1f205f8..f11753e6244 100644
--- a/Build/source/texk/kpathsea/tex-file.c
+++ b/Build/source/texk/kpathsea/tex-file.c
@@ -843,54 +843,56 @@ kpathsea_init_format_return_varlist(kpathsea kpse,kpse_file_format_type format)
#define MAYBE(member) (FMT_INFO.member ? FMT_INFO.member : "(none)")
/* Describe the monster we've created. */
- if (KPATHSEA_DEBUG_P (KPSE_DEBUG_PATHS))
- {
- DEBUGF2 ("Search path for %s files (from %s)\n",
- FMT_INFO.type, FMT_INFO.path_source);
- DEBUGF1 (" = %s\n", FMT_INFO.path);
- DEBUGF1 (" before expansion = %s\n", FMT_INFO.raw_path);
- DEBUGF1 (" application override path = %s\n", MAYBE (override_path));
- DEBUGF1 (" application config file path = %s\n", MAYBE (client_path));
- DEBUGF1 (" texmf.cnf path = %s\n", MAYBE (cnf_path));
- DEBUGF1 (" compile-time path = %s\n", MAYBE (default_path));
- DEBUGF1 (" environment variables = %s\n", envvar_list);
- DEBUGF (" default suffixes =");
- if (FMT_INFO.suffix) {
- const_string *ext;
- for (ext = FMT_INFO.suffix; ext && *ext; ext++) {
- fprintf (stderr, " %s", *ext);
- }
- putc ('\n', stderr);
- } else {
- fputs (" (none)\n", stderr);
+ if (KPATHSEA_DEBUG_P (KPSE_DEBUG_PATHS)) {
+ if (format == kpse_cnf_format)
+ fputs ("\n", stderr); /* always mid-search, so break log output */
+
+ DEBUGF2 ("Search path for %s files (from %s)\n",
+ FMT_INFO.type, FMT_INFO.path_source);
+ DEBUGF1 (" = %s\n", FMT_INFO.path);
+ DEBUGF1 (" before expansion = %s\n", FMT_INFO.raw_path);
+ DEBUGF1 (" application override path = %s\n", MAYBE (override_path));
+ DEBUGF1 (" application config file path = %s\n", MAYBE (client_path));
+ DEBUGF1 (" texmf.cnf path = %s\n", MAYBE (cnf_path));
+ DEBUGF1 (" compile-time path = %s\n", MAYBE (default_path));
+ DEBUGF1 (" environment variables = %s\n", envvar_list);
+ DEBUGF (" default suffixes =");
+ if (FMT_INFO.suffix) {
+ const_string *ext;
+ for (ext = FMT_INFO.suffix; ext && *ext; ext++) {
+ fprintf (stderr, " %s", *ext);
}
- DEBUGF (" other suffixes =");
- if (FMT_INFO.alt_suffix) {
- const_string *alt;
- for (alt = FMT_INFO.alt_suffix; alt && *alt; alt++) {
- fprintf (stderr, " %s", *alt);
- }
- putc ('\n', stderr);
- } else {
- fputs (" (none)\n", stderr);
+ putc ('\n', stderr);
+ } else {
+ fputs (" (none)\n", stderr);
+ }
+ DEBUGF (" other suffixes =");
+ if (FMT_INFO.alt_suffix) {
+ const_string *alt;
+ for (alt = FMT_INFO.alt_suffix; alt && *alt; alt++) {
+ fprintf (stderr, " %s", *alt);
}
- DEBUGF1 (" search only with suffix = %d\n",FMT_INFO.suffix_search_only);
- DEBUGF1 (" runtime generation program = %s\n", MAYBE (program));
- DEBUGF (" runtime generation command =");
- if (FMT_INFO.argv) {
- const_string *arg;
- for (arg = FMT_INFO.argv; *arg; arg++) {
- fprintf (stderr, " %s", *arg);
- }
- putc ('\n', stderr);
- } else {
- fputs(" (none)\n", stderr);
+ putc ('\n', stderr);
+ } else {
+ fputs (" (none)\n", stderr);
+ }
+ DEBUGF1 (" search only with suffix = %d\n",FMT_INFO.suffix_search_only);
+ DEBUGF1 (" runtime generation program = %s\n", MAYBE (program));
+ DEBUGF (" runtime generation command =");
+ if (FMT_INFO.argv) {
+ const_string *arg;
+ for (arg = FMT_INFO.argv; *arg; arg++) {
+ fprintf (stderr, " %s", *arg);
}
- DEBUGF1 (" program enabled = %d\n", FMT_INFO.program_enabled_p);
- DEBUGF1 (" program enable level = %d\n", FMT_INFO.program_enable_level);
- DEBUGF1 (" open files in binary mode = %d\n", FMT_INFO.binmode);
- DEBUGF1 (" numeric format value = %d\n", format);
+ putc ('\n', stderr);
+ } else {
+ fputs(" (none)\n", stderr);
}
+ DEBUGF1 (" program enabled = %d\n", FMT_INFO.program_enabled_p);
+ DEBUGF1 (" program enable level = %d\n", FMT_INFO.program_enable_level);
+ DEBUGF1 (" open files in binary mode = %d\n", FMT_INFO.binmode);
+ DEBUGF1 (" numeric format value = %d\n", format);
+}
#endif /* KPSE_DEBUG */
return envvar_list;
@@ -1045,8 +1047,6 @@ kpathsea_find_file_generic (kpathsea kpse, const_string const_name,
/* Do variable and tilde expansion. */
name = kpathsea_expand (kpse, const_name);
- try_std_extension_first
- = kpathsea_var_value (kpse, "try_std_extension_first");
has_any_suffix = strrchr (name, '.');
if (has_any_suffix) {
string p = strchr (has_any_suffix, DIR_SEP);
@@ -1076,8 +1076,10 @@ kpathsea_find_file_generic (kpathsea kpse, const_string const_name,
try_std_extension_first. */
count = 0;
target = XTALLOC1 (string);
+ try_std_extension_first
+ = kpathsea_var_value (kpse, "try_std_extension_first");
- if (has_any_suffix
+ if (has_any_suffix /* xxx && ! KPSE_CNF_VALUE_P (try_std_extension_first)*/
&& (try_std_extension_first == NULL || *try_std_extension_first == 'f'
|| *try_std_extension_first == '0')) {
target_asis_name (kpse, &target, &count, format, name, use_fontmaps,